diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 15:46:37 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 15:46:37 -0500 |
commit | 31564cbd77baa88405862d4aa0d00893ab1d8cb7 (patch) | |
tree | 2eaec947ab64ccfa2d94ca29bf14feb70b8a4b61 /drivers/input/misc/da9052_onkey.c | |
parent | 6842d98de7bb726dfddc719cb9ae022b26a0f2b8 (diff) | |
parent | 022573c275500e1a50889949f679d04b5446edf6 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull second round of input updates from Dmitry Torokhov:
"As usual, there are a couple of new drivers, input core now supports
managed input devices (devres), a slew of drivers now have device tree
support and a bunch of fixes and cleanups."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (71 commits)
Input: walkera0701 - fix crash on startup
Input: matrix-keymap - provide a proper module license
Input: gpio_keys_polled - switch to using gpio_request_one()
Input: gpio_keys - switch to using gpio_request_one()
Input: wacom - fix touch support for Bamboo Fun CTH-461
Input: xpad - add a few new VID/PID combinations
Input: xpad - minor formatting fixes
Input: gpio-keys-polled - honor 'autorepeat' setting in platform data
Input: tca8418-keypad - switch to using managed resources
Input: tca8418_keypad - increase severity of failures in probe()
Input: tca8418_keypad - move device ID tables closer to where they are used
Input: tca8418_keypad - use dev_get_platdata() to retrieve platform data
Input: tca8418_keypad - use a temporary variable for parent device
Input: tca8418_keypad - add support for shared interrupt
Input: tca8418_keypad - add support for device tree bindings
Input: remove Compaq iPAQ H3600 (Bitsy) touchscreen driver
Input: bu21013_ts - add support for Device Tree booting
Input: bu21013_ts - move GPIO init and exit functions into the driver
Input: bu21013_ts - request regulator that actually exists
ARM: ux500: Strip out duplicate touch screen platform information
...
Diffstat (limited to 'drivers/input/misc/da9052_onkey.c')
-rw-r--r-- | drivers/input/misc/da9052_onkey.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/misc/da9052_onkey.c b/drivers/input/misc/da9052_onkey.c index 3be3acc3a6eb..020569a499f2 100644 --- a/drivers/input/misc/da9052_onkey.c +++ b/drivers/input/misc/da9052_onkey.c | |||
@@ -70,7 +70,7 @@ static irqreturn_t da9052_onkey_irq(int irq, void *data) | |||
70 | return IRQ_HANDLED; | 70 | return IRQ_HANDLED; |
71 | } | 71 | } |
72 | 72 | ||
73 | static int __devinit da9052_onkey_probe(struct platform_device *pdev) | 73 | static int da9052_onkey_probe(struct platform_device *pdev) |
74 | { | 74 | { |
75 | struct da9052 *da9052 = dev_get_drvdata(pdev->dev.parent); | 75 | struct da9052 *da9052 = dev_get_drvdata(pdev->dev.parent); |
76 | struct da9052_onkey *onkey; | 76 | struct da9052_onkey *onkey; |
@@ -129,7 +129,7 @@ err_free_mem: | |||
129 | return error; | 129 | return error; |
130 | } | 130 | } |
131 | 131 | ||
132 | static int __devexit da9052_onkey_remove(struct platform_device *pdev) | 132 | static int da9052_onkey_remove(struct platform_device *pdev) |
133 | { | 133 | { |
134 | struct da9052_onkey *onkey = platform_get_drvdata(pdev); | 134 | struct da9052_onkey *onkey = platform_get_drvdata(pdev); |
135 | 135 | ||
@@ -144,7 +144,7 @@ static int __devexit da9052_onkey_remove(struct platform_device *pdev) | |||
144 | 144 | ||
145 | static struct platform_driver da9052_onkey_driver = { | 145 | static struct platform_driver da9052_onkey_driver = { |
146 | .probe = da9052_onkey_probe, | 146 | .probe = da9052_onkey_probe, |
147 | .remove = __devexit_p(da9052_onkey_remove), | 147 | .remove = da9052_onkey_remove, |
148 | .driver = { | 148 | .driver = { |
149 | .name = "da9052-onkey", | 149 | .name = "da9052-onkey", |
150 | .owner = THIS_MODULE, | 150 | .owner = THIS_MODULE, |