aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/power/reset
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-14 19:10:09 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-14 19:10:09 -0500
commite6b5be2be4e30037eb551e0ed09dd97bd00d85d3 (patch)
tree88801365987a0dc64d62d47e8a11f3b44691c37f /drivers/power/reset
parent37da7bbbe84fe9e8862940d3f9194fd27dce59bb (diff)
parentf1c488a78d9f1a22cdb15648c15e70fd82ed229a (diff)
Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core update from Greg KH: "Here's the set of driver core patches for 3.19-rc1. They are dominated by the removal of the .owner field in platform drivers. They touch a lot of files, but they are "simple" changes, just removing a line in a structure. Other than that, a few minor driver core and debugfs changes. There are some ath9k patches coming in through this tree that have been acked by the wireless maintainers as they relied on the debugfs changes. Everything has been in linux-next for a while" * tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (324 commits) Revert "ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries" fs: debugfs: add forward declaration for struct device type firmware class: Deletion of an unnecessary check before the function call "vunmap" firmware loader: fix hung task warning dump devcoredump: provide a one-way disable function device: Add dev_<level>_once variants ath: ath9k: use debugfs_create_devm_seqfile() helper for seq_file entries ath: use seq_file api for ath9k debugfs files debugfs: add helper function to create device related seq_file drivers/base: cacheinfo: remove noisy error boot message Revert "core: platform: add warning if driver has no owner" drivers: base: support cpu cache information interface to userspace via sysfs drivers: base: add cpu_device_create to support per-cpu devices topology: replace custom attribute macros with standard DEVICE_ATTR* cpumask: factor out show_cpumap into separate helper function driver core: Fix unbalanced device reference in drivers_probe driver core: fix race with userland in device_add() sysfs/kernfs: make read requests on pre-alloc files use the buffer. sysfs/kernfs: allow attributes to request write buffer be pre-allocated. fs: sysfs: return EGBIG on write if offset is larger than file size ...
Diffstat (limited to 'drivers/power/reset')
-rw-r--r--drivers/power/reset/as3722-poweroff.c1
-rw-r--r--drivers/power/reset/brcmstb-reboot.c1
-rw-r--r--drivers/power/reset/gpio-poweroff.c1
-rw-r--r--drivers/power/reset/gpio-restart.c1
-rw-r--r--drivers/power/reset/keystone-reset.c1
-rw-r--r--drivers/power/reset/ltc2952-poweroff.c1
-rw-r--r--drivers/power/reset/qnap-poweroff.c1
-rw-r--r--drivers/power/reset/restart-poweroff.c1
8 files changed, 0 insertions, 8 deletions
diff --git a/drivers/power/reset/as3722-poweroff.c b/drivers/power/reset/as3722-poweroff.c
index 684971199bd3..60d0295fffb1 100644
--- a/drivers/power/reset/as3722-poweroff.c
+++ b/drivers/power/reset/as3722-poweroff.c
@@ -82,7 +82,6 @@ static int as3722_poweroff_remove(struct platform_device *pdev)
82static struct platform_driver as3722_poweroff_driver = { 82static struct platform_driver as3722_poweroff_driver = {
83 .driver = { 83 .driver = {
84 .name = "as3722-power-off", 84 .name = "as3722-power-off",
85 .owner = THIS_MODULE,
86 }, 85 },
87 .probe = as3722_poweroff_probe, 86 .probe = as3722_poweroff_probe,
88 .remove = as3722_poweroff_remove, 87 .remove = as3722_poweroff_remove,
diff --git a/drivers/power/reset/brcmstb-reboot.c b/drivers/power/reset/brcmstb-reboot.c
index 3f236924742a..c523ea7a90ee 100644
--- a/drivers/power/reset/brcmstb-reboot.c
+++ b/drivers/power/reset/brcmstb-reboot.c
@@ -107,7 +107,6 @@ static struct platform_driver brcmstb_reboot_driver = {
107 .probe = brcmstb_reboot_probe, 107 .probe = brcmstb_reboot_probe,
108 .driver = { 108 .driver = {
109 .name = "brcmstb-reboot", 109 .name = "brcmstb-reboot",
110 .owner = THIS_MODULE,
111 .of_match_table = of_match, 110 .of_match_table = of_match,
112 }, 111 },
113}; 112};
diff --git a/drivers/power/reset/gpio-poweroff.c b/drivers/power/reset/gpio-poweroff.c
index ce849bc9b269..e5332f1db8a7 100644
--- a/drivers/power/reset/gpio-poweroff.c
+++ b/drivers/power/reset/gpio-poweroff.c
@@ -99,7 +99,6 @@ static struct platform_driver gpio_poweroff_driver = {
99 .remove = gpio_poweroff_remove, 99 .remove = gpio_poweroff_remove,
100 .driver = { 100 .driver = {
101 .name = "poweroff-gpio", 101 .name = "poweroff-gpio",
102 .owner = THIS_MODULE,
103 .of_match_table = of_gpio_poweroff_match, 102 .of_match_table = of_gpio_poweroff_match,
104 }, 103 },
105}; 104};
diff --git a/drivers/power/reset/gpio-restart.c b/drivers/power/reset/gpio-restart.c
index a76829b3f1cd..edb327efee8b 100644
--- a/drivers/power/reset/gpio-restart.c
+++ b/drivers/power/reset/gpio-restart.c
@@ -137,7 +137,6 @@ static struct platform_driver gpio_restart_driver = {
137 .remove = gpio_restart_remove, 137 .remove = gpio_restart_remove,
138 .driver = { 138 .driver = {
139 .name = "restart-gpio", 139 .name = "restart-gpio",
140 .owner = THIS_MODULE,
141 .of_match_table = of_gpio_restart_match, 140 .of_match_table = of_gpio_restart_match,
142 }, 141 },
143}; 142};
diff --git a/drivers/power/reset/keystone-reset.c b/drivers/power/reset/keystone-reset.c
index 408a18fd91cb..86bc100818b2 100644
--- a/drivers/power/reset/keystone-reset.c
+++ b/drivers/power/reset/keystone-reset.c
@@ -153,7 +153,6 @@ static int rsctrl_probe(struct platform_device *pdev)
153static struct platform_driver rsctrl_driver = { 153static struct platform_driver rsctrl_driver = {
154 .probe = rsctrl_probe, 154 .probe = rsctrl_probe,
155 .driver = { 155 .driver = {
156 .owner = THIS_MODULE,
157 .name = KBUILD_MODNAME, 156 .name = KBUILD_MODNAME,
158 .of_match_table = rsctrl_of_match, 157 .of_match_table = rsctrl_of_match,
159 }, 158 },
diff --git a/drivers/power/reset/ltc2952-poweroff.c b/drivers/power/reset/ltc2952-poweroff.c
index 116a1cef8f7b..34f38a3dc3ff 100644
--- a/drivers/power/reset/ltc2952-poweroff.c
+++ b/drivers/power/reset/ltc2952-poweroff.c
@@ -342,7 +342,6 @@ static struct platform_driver ltc2952_poweroff_driver = {
342 .remove = ltc2952_poweroff_remove, 342 .remove = ltc2952_poweroff_remove,
343 .driver = { 343 .driver = {
344 .name = "ltc2952-poweroff", 344 .name = "ltc2952-poweroff",
345 .owner = THIS_MODULE,
346 .of_match_table = of_ltc2952_poweroff_match, 345 .of_match_table = of_ltc2952_poweroff_match,
347 }, 346 },
348 .suspend = ltc2952_poweroff_suspend, 347 .suspend = ltc2952_poweroff_suspend,
diff --git a/drivers/power/reset/qnap-poweroff.c b/drivers/power/reset/qnap-poweroff.c
index a75db7f8a92f..2789a61cec68 100644
--- a/drivers/power/reset/qnap-poweroff.c
+++ b/drivers/power/reset/qnap-poweroff.c
@@ -129,7 +129,6 @@ static struct platform_driver qnap_power_off_driver = {
129 .probe = qnap_power_off_probe, 129 .probe = qnap_power_off_probe,
130 .remove = qnap_power_off_remove, 130 .remove = qnap_power_off_remove,
131 .driver = { 131 .driver = {
132 .owner = THIS_MODULE,
133 .name = "qnap_power_off", 132 .name = "qnap_power_off",
134 .of_match_table = of_match_ptr(qnap_power_off_of_match_table), 133 .of_match_table = of_match_ptr(qnap_power_off_of_match_table),
135 }, 134 },
diff --git a/drivers/power/reset/restart-poweroff.c b/drivers/power/reset/restart-poweroff.c
index edd707ee7281..f46f2c2e4648 100644
--- a/drivers/power/reset/restart-poweroff.c
+++ b/drivers/power/reset/restart-poweroff.c
@@ -55,7 +55,6 @@ static struct platform_driver restart_poweroff_driver = {
55 .remove = restart_poweroff_remove, 55 .remove = restart_poweroff_remove,
56 .driver = { 56 .driver = {
57 .name = "poweroff-restart", 57 .name = "poweroff-restart",
58 .owner = THIS_MODULE,
59 .of_match_table = of_restart_poweroff_match, 58 .of_match_table = of_restart_poweroff_match,
60 }, 59 },
61}; 60};