diff options
| author | Bill Pemberton <wfp5p@virginia.edu> | 2012-11-24 00:50:47 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-11-24 03:05:38 -0500 |
| commit | e2619cf78e19476bfd7ceaefa9eff0847529346e (patch) | |
| tree | e1eec6ea5d420491e9afc18a4d604f7c33c325de /drivers/input/mouse | |
| parent | 5298cc4cc753bbe4c530b41341834f6ef3344d0d (diff) | |
Input: remove use of __devexit
CONFIG_HOTPLUG is going away as an option so __devexit is no
longer needed.
Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/mouse')
| -rw-r--r-- | drivers/input/mouse/gpio_mouse.c | 2 | ||||
| -rw-r--r-- | drivers/input/mouse/maplemouse.c | 2 | ||||
| -rw-r--r-- | drivers/input/mouse/navpoint.c | 2 | ||||
| -rw-r--r-- | drivers/input/mouse/pxa930_trkball.c | 2 | ||||
| -rw-r--r-- | drivers/input/mouse/synaptics_i2c.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/mouse/gpio_mouse.c b/drivers/input/mouse/gpio_mouse.c index 8e1fe82e16b7..532eaca4cc56 100644 --- a/drivers/input/mouse/gpio_mouse.c +++ b/drivers/input/mouse/gpio_mouse.c | |||
| @@ -150,7 +150,7 @@ static int gpio_mouse_probe(struct platform_device *pdev) | |||
| 150 | return error; | 150 | return error; |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | static int __devexit gpio_mouse_remove(struct platform_device *pdev) | 153 | static int gpio_mouse_remove(struct platform_device *pdev) |
| 154 | { | 154 | { |
| 155 | struct input_polled_dev *input = platform_get_drvdata(pdev); | 155 | struct input_polled_dev *input = platform_get_drvdata(pdev); |
| 156 | struct gpio_mouse_platform_data *pdata = input->private; | 156 | struct gpio_mouse_platform_data *pdata = input->private; |
diff --git a/drivers/input/mouse/maplemouse.c b/drivers/input/mouse/maplemouse.c index 3541f362866b..0a60717b91c6 100644 --- a/drivers/input/mouse/maplemouse.c +++ b/drivers/input/mouse/maplemouse.c | |||
| @@ -114,7 +114,7 @@ fail: | |||
| 114 | return error; | 114 | return error; |
| 115 | } | 115 | } |
| 116 | 116 | ||
| 117 | static int __devexit remove_maple_mouse(struct device *dev) | 117 | static int remove_maple_mouse(struct device *dev) |
| 118 | { | 118 | { |
| 119 | struct maple_device *mdev = to_maple_dev(dev); | 119 | struct maple_device *mdev = to_maple_dev(dev); |
| 120 | struct dc_mouse *mse = maple_get_drvdata(mdev); | 120 | struct dc_mouse *mse = maple_get_drvdata(mdev); |
diff --git a/drivers/input/mouse/navpoint.c b/drivers/input/mouse/navpoint.c index f51df6bfc52b..8e1b98ea5648 100644 --- a/drivers/input/mouse/navpoint.c +++ b/drivers/input/mouse/navpoint.c | |||
| @@ -299,7 +299,7 @@ err_free_gpio: | |||
| 299 | return error; | 299 | return error; |
| 300 | } | 300 | } |
| 301 | 301 | ||
| 302 | static int __devexit navpoint_remove(struct platform_device *pdev) | 302 | static int navpoint_remove(struct platform_device *pdev) |
| 303 | { | 303 | { |
| 304 | const struct navpoint_platform_data *pdata = | 304 | const struct navpoint_platform_data *pdata = |
| 305 | dev_get_platdata(&pdev->dev); | 305 | dev_get_platdata(&pdev->dev); |
diff --git a/drivers/input/mouse/pxa930_trkball.c b/drivers/input/mouse/pxa930_trkball.c index ed808fce0ac0..0ecb9e7945eb 100644 --- a/drivers/input/mouse/pxa930_trkball.c +++ b/drivers/input/mouse/pxa930_trkball.c | |||
| @@ -230,7 +230,7 @@ failed: | |||
| 230 | return error; | 230 | return error; |
| 231 | } | 231 | } |
| 232 | 232 | ||
| 233 | static int __devexit pxa930_trkball_remove(struct platform_device *pdev) | 233 | static int pxa930_trkball_remove(struct platform_device *pdev) |
| 234 | { | 234 | { |
| 235 | struct pxa930_trkball *trkball = platform_get_drvdata(pdev); | 235 | struct pxa930_trkball *trkball = platform_get_drvdata(pdev); |
| 236 | int irq = platform_get_irq(pdev, 0); | 236 | int irq = platform_get_irq(pdev, 0); |
diff --git a/drivers/input/mouse/synaptics_i2c.c b/drivers/input/mouse/synaptics_i2c.c index 007c378bd694..ad822608f6ee 100644 --- a/drivers/input/mouse/synaptics_i2c.c +++ b/drivers/input/mouse/synaptics_i2c.c | |||
| @@ -601,7 +601,7 @@ err_mem_free: | |||
| 601 | return ret; | 601 | return ret; |
| 602 | } | 602 | } |
| 603 | 603 | ||
| 604 | static int __devexit synaptics_i2c_remove(struct i2c_client *client) | 604 | static int synaptics_i2c_remove(struct i2c_client *client) |
| 605 | { | 605 | { |
| 606 | struct synaptics_i2c *touch = i2c_get_clientdata(client); | 606 | struct synaptics_i2c *touch = i2c_get_clientdata(client); |
| 607 | 607 | ||
