aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/misc
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2015-01-15 12:46:14 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2015-01-15 12:46:14 -0500
commit0c49cd295d42d0032af11d55e2140dbec11dc8d0 (patch)
tree1e7d0e50b6b6d6e4de1fb6bb0b6d856c3932da58 /drivers/input/misc
parent0c3e99437a66e4c869c60c2398449e6d98f3a988 (diff)
parenteaa27f34e91a14cdceed26ed6c6793ec1d186115 (diff)
Merge tag 'v3.19-rc4' into next
Merge with mainline to bring in the latest thermal and other changes.
Diffstat (limited to 'drivers/input/misc')
-rw-r--r--drivers/input/misc/88pm80x_onkey.c1
-rw-r--r--drivers/input/misc/88pm860x_onkey.c1
-rw-r--r--drivers/input/misc/ab8500-ponkey.c1
-rw-r--r--drivers/input/misc/arizona-haptics.c1
-rw-r--r--drivers/input/misc/bfin_rotary.c1
-rw-r--r--drivers/input/misc/cobalt_btns.c1
-rw-r--r--drivers/input/misc/da9052_onkey.c1
-rw-r--r--drivers/input/misc/da9055_onkey.c1
-rw-r--r--drivers/input/misc/dm355evm_keys.c1
-rw-r--r--drivers/input/misc/gpio-beeper.c1
-rw-r--r--drivers/input/misc/gpio_tilt_polled.c1
-rw-r--r--drivers/input/misc/ideapad_slidebar.c1
-rw-r--r--drivers/input/misc/ims-pcu.c2
-rw-r--r--drivers/input/misc/ixp4xx-beeper.c1
-rw-r--r--drivers/input/misc/m68kspkr.c1
-rw-r--r--drivers/input/misc/max77693-haptic.c8
-rw-r--r--drivers/input/misc/max8925_onkey.c1
-rw-r--r--drivers/input/misc/max8997_haptic.c1
-rw-r--r--drivers/input/misc/mc13783-pwrbutton.c1
-rw-r--r--drivers/input/misc/palmas-pwrbutton.c1
-rw-r--r--drivers/input/misc/pcap_keys.c1
-rw-r--r--drivers/input/misc/pcspkr.c1
-rw-r--r--drivers/input/misc/pm8xxx-vibrator.c1
-rw-r--r--drivers/input/misc/pmic8xxx-pwrkey.c1
-rw-r--r--drivers/input/misc/pwm-beeper.c1
-rw-r--r--drivers/input/misc/rb532_button.c1
-rw-r--r--drivers/input/misc/retu-pwrbutton.c1
-rw-r--r--drivers/input/misc/rotary_encoder.c1
-rw-r--r--drivers/input/misc/sgi_btns.c1
-rw-r--r--drivers/input/misc/sirfsoc-onkey.c1
-rw-r--r--drivers/input/misc/soc_button_array.c3
-rw-r--r--drivers/input/misc/sparcspkr.c2
-rw-r--r--drivers/input/misc/twl4030-pwrbutton.c2
-rw-r--r--drivers/input/misc/twl4030-vibra.c1
-rw-r--r--drivers/input/misc/twl6040-vibra.c1
-rw-r--r--drivers/input/misc/wistron_btns.c1
-rw-r--r--drivers/input/misc/wm831x-on.c1
-rw-r--r--drivers/input/misc/xen-kbdfront.c9
38 files changed, 11 insertions, 47 deletions
diff --git a/drivers/input/misc/88pm80x_onkey.c b/drivers/input/misc/88pm80x_onkey.c
index ee43e5b7c881..cf9908f1e5d5 100644
--- a/drivers/input/misc/88pm80x_onkey.c
+++ b/drivers/input/misc/88pm80x_onkey.c
@@ -153,7 +153,6 @@ static int pm80x_onkey_remove(struct platform_device *pdev)
153static struct platform_driver pm80x_onkey_driver = { 153static struct platform_driver pm80x_onkey_driver = {
154 .driver = { 154 .driver = {
155 .name = "88pm80x-onkey", 155 .name = "88pm80x-onkey",
156 .owner = THIS_MODULE,
157 .pm = &pm80x_onkey_pm_ops, 156 .pm = &pm80x_onkey_pm_ops,
158 }, 157 },
159 .probe = pm80x_onkey_probe, 158 .probe = pm80x_onkey_probe,
diff --git a/drivers/input/misc/88pm860x_onkey.c b/drivers/input/misc/88pm860x_onkey.c
index 3cbd1b309220..cc87443aa2ee 100644
--- a/drivers/input/misc/88pm860x_onkey.c
+++ b/drivers/input/misc/88pm860x_onkey.c
@@ -136,7 +136,6 @@ static SIMPLE_DEV_PM_OPS(pm860x_onkey_pm_ops, pm860x_onkey_suspend, pm860x_onkey
136static struct platform_driver pm860x_onkey_driver = { 136static struct platform_driver pm860x_onkey_driver = {
137 .driver = { 137 .driver = {
138 .name = "88pm860x-onkey", 138 .name = "88pm860x-onkey",
139 .owner = THIS_MODULE,
140 .pm = &pm860x_onkey_pm_ops, 139 .pm = &pm860x_onkey_pm_ops,
141 }, 140 },
142 .probe = pm860x_onkey_probe, 141 .probe = pm860x_onkey_probe,
diff --git a/drivers/input/misc/ab8500-ponkey.c b/drivers/input/misc/ab8500-ponkey.c
index 95ef7dd6442d..1f7e15ca5fbe 100644
--- a/drivers/input/misc/ab8500-ponkey.c
+++ b/drivers/input/misc/ab8500-ponkey.c
@@ -123,7 +123,6 @@ static const struct of_device_id ab8500_ponkey_match[] = {
123static struct platform_driver ab8500_ponkey_driver = { 123static struct platform_driver ab8500_ponkey_driver = {
124 .driver = { 124 .driver = {
125 .name = "ab8500-poweron-key", 125 .name = "ab8500-poweron-key",
126 .owner = THIS_MODULE,
127 .of_match_table = of_match_ptr(ab8500_ponkey_match), 126 .of_match_table = of_match_ptr(ab8500_ponkey_match),
128 }, 127 },
129 .probe = ab8500_ponkey_probe, 128 .probe = ab8500_ponkey_probe,
diff --git a/drivers/input/misc/arizona-haptics.c b/drivers/input/misc/arizona-haptics.c
index ef2e281b0a43..4dbbed74c9e4 100644
--- a/drivers/input/misc/arizona-haptics.c
+++ b/drivers/input/misc/arizona-haptics.c
@@ -225,7 +225,6 @@ static struct platform_driver arizona_haptics_driver = {
225 .remove = arizona_haptics_remove, 225 .remove = arizona_haptics_remove,
226 .driver = { 226 .driver = {
227 .name = "arizona-haptics", 227 .name = "arizona-haptics",
228 .owner = THIS_MODULE,
229 }, 228 },
230}; 229};
231module_platform_driver(arizona_haptics_driver); 230module_platform_driver(arizona_haptics_driver);
diff --git a/drivers/input/misc/bfin_rotary.c b/drivers/input/misc/bfin_rotary.c
index e69d9bcb37e1..3f4351579372 100644
--- a/drivers/input/misc/bfin_rotary.c
+++ b/drivers/input/misc/bfin_rotary.c
@@ -256,7 +256,6 @@ static struct platform_driver bfin_rotary_device_driver = {
256 .remove = bfin_rotary_remove, 256 .remove = bfin_rotary_remove,
257 .driver = { 257 .driver = {
258 .name = "bfin-rotary", 258 .name = "bfin-rotary",
259 .owner = THIS_MODULE,
260#ifdef CONFIG_PM 259#ifdef CONFIG_PM
261 .pm = &bfin_rotary_pm_ops, 260 .pm = &bfin_rotary_pm_ops,
262#endif 261#endif
diff --git a/drivers/input/misc/cobalt_btns.c b/drivers/input/misc/cobalt_btns.c
index 3e11510ff82d..fbe72afc9347 100644
--- a/drivers/input/misc/cobalt_btns.c
+++ b/drivers/input/misc/cobalt_btns.c
@@ -157,7 +157,6 @@ static struct platform_driver cobalt_buttons_driver = {
157 .remove = cobalt_buttons_remove, 157 .remove = cobalt_buttons_remove,
158 .driver = { 158 .driver = {
159 .name = "Cobalt buttons", 159 .name = "Cobalt buttons",
160 .owner = THIS_MODULE,
161 }, 160 },
162}; 161};
163module_platform_driver(cobalt_buttons_driver); 162module_platform_driver(cobalt_buttons_driver);
diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c
index 184c8f21ab59..266e07fdc182 100644
--- a/drivers/input/misc/da9052_onkey.c
+++ b/drivers/input/misc/da9052_onkey.c
@@ -149,7 +149,6 @@ static struct platform_driver da9052_onkey_driver = {
149 .remove = da9052_onkey_remove, 149 .remove = da9052_onkey_remove,
150 .driver = { 150 .driver = {
151 .name = "da9052-onkey", 151 .name = "da9052-onkey",
152 .owner = THIS_MODULE,
153 }, 152 },
154}; 153};
155module_platform_driver(da9052_onkey_driver); 154module_platform_driver(da9052_onkey_driver);
diff --git a/drivers/input/misc/da9055_onkey.c b/drivers/input/misc/da9055_onkey.c
index 4765799fef74..3251a9693f45 100644
--- a/drivers/input/misc/da9055_onkey.c
+++ b/drivers/input/misc/da9055_onkey.c
@@ -157,7 +157,6 @@ static struct platform_driver da9055_onkey_driver = {
157 .remove = da9055_onkey_remove, 157 .remove = da9055_onkey_remove,
158 .driver = { 158 .driver = {
159 .name = "da9055-onkey", 159 .name = "da9055-onkey",
160 .owner = THIS_MODULE,
161 }, 160 },
162}; 161};
163 162
diff --git a/drivers/input/misc/dm355evm_keys.c b/drivers/input/misc/dm355evm_keys.c
index 0eba94f581df..b6b7bd4e5462 100644
--- a/drivers/input/misc/dm355evm_keys.c
+++ b/drivers/input/misc/dm355evm_keys.c
@@ -263,7 +263,6 @@ static struct platform_driver dm355evm_keys_driver = {
263 .probe = dm355evm_keys_probe, 263 .probe = dm355evm_keys_probe,
264 .remove = dm355evm_keys_remove, 264 .remove = dm355evm_keys_remove,
265 .driver = { 265 .driver = {
266 .owner = THIS_MODULE,
267 .name = "dm355evm_keys", 266 .name = "dm355evm_keys",
268 }, 267 },
269}; 268};
diff --git a/drivers/input/misc/gpio-beeper.c b/drivers/input/misc/gpio-beeper.c
index 8886af63eae3..4817c5f0c3e4 100644
--- a/drivers/input/misc/gpio-beeper.c
+++ b/drivers/input/misc/gpio-beeper.c
@@ -112,7 +112,6 @@ MODULE_DEVICE_TABLE(of, gpio_beeper_of_match);
112static struct platform_driver gpio_beeper_platform_driver = { 112static struct platform_driver gpio_beeper_platform_driver = {
113 .driver = { 113 .driver = {
114 .name = BEEPER_MODNAME, 114 .name = BEEPER_MODNAME,
115 .owner = THIS_MODULE,
116 .of_match_table = of_match_ptr(gpio_beeper_of_match), 115 .of_match_table = of_match_ptr(gpio_beeper_of_match),
117 }, 116 },
118 .probe = gpio_beeper_probe, 117 .probe = gpio_beeper_probe,
diff --git a/drivers/input/misc/gpio_tilt_polled.c b/drivers/input/misc/gpio_tilt_polled.c
index 1a81d9115226..f103b99d1852 100644
--- a/drivers/input/misc/gpio_tilt_polled.c
+++ b/drivers/input/misc/gpio_tilt_polled.c
@@ -199,7 +199,6 @@ static struct platform_driver gpio_tilt_polled_driver = {
199 .remove = gpio_tilt_polled_remove, 199 .remove = gpio_tilt_polled_remove,
200 .driver = { 200 .driver = {
201 .name = DRV_NAME, 201 .name = DRV_NAME,
202 .owner = THIS_MODULE,
203 }, 202 },
204};