diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 12:46:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-18 12:46:37 -0800 |
| commit | 31564cbd77baa88405862d4aa0d00893ab1d8cb7 (patch) | |
| tree | 2eaec947ab64ccfa2d94ca29bf14feb70b8a4b61 /drivers/input/touchscreen/ti_am335x_tsc.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/touchscreen/ti_am335x_tsc.c')
| -rw-r--r-- | drivers/input/touchscreen/ti_am335x_tsc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/input/touchscreen/ti_am335x_tsc.c b/drivers/input/touchscreen/ti_am335x_tsc.c index 7a18a8a15228..51e7b87827a4 100644 --- a/drivers/input/touchscreen/ti_am335x_tsc.c +++ b/drivers/input/touchscreen/ti_am335x_tsc.c @@ -258,7 +258,7 @@ static irqreturn_t titsc_irq(int irq, void *dev) * The functions for inserting/removing driver as a module. */ -static int __devinit titsc_probe(struct platform_device *pdev) +static int titsc_probe(struct platform_device *pdev) { struct titsc *ts_dev; struct input_dev *input_dev; @@ -327,7 +327,7 @@ err_free_mem: return err; } -static int __devexit titsc_remove(struct platform_device *pdev) +static int titsc_remove(struct platform_device *pdev) { struct ti_tscadc_dev *tscadc_dev = pdev->dev.platform_data; struct titsc *ts_dev = tscadc_dev->tsc; @@ -384,7 +384,7 @@ static const struct dev_pm_ops titsc_pm_ops = { static struct platform_driver ti_tsc_driver = { .probe = titsc_probe, - .remove = __devexit_p(titsc_remove), + .remove = titsc_remove, .driver = { .name = "tsc", .owner = THIS_MODULE, |