aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/joystick
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-24 00:38:25 -0500
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2012-11-24 03:05:19 -0500
commit5298cc4cc753bbe4c530b41341834f6ef3344d0d (patch)
tree5dde0337622144b635a7dc199844ed5376794b09 /drivers/input/joystick
parent78f50c246f4286d40a1f42fecc779d47e40503a2 (diff)
Input: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Acked-by: Javier Martinez Canillas <javier@dowhile0.org> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input/joystick')
-rw-r--r--drivers/input/joystick/as5011.c6
-rw-r--r--drivers/input/joystick/maplecontrol.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c
index 94f332773aec..ad7673305d7d 100644
--- a/drivers/input/joystick/as5011.c
+++ b/drivers/input/joystick/as5011.c
@@ -157,7 +157,7 @@ out:
157 return IRQ_HANDLED; 157 return IRQ_HANDLED;
158} 158}
159 159
160static int __devinit as5011_configure_chip(struct as5011_device *as5011, 160static int as5011_configure_chip(struct as5011_device *as5011,
161 const struct as5011_platform_data *plat_dat) 161 const struct as5011_platform_data *plat_dat)
162{ 162{
163 struct i2c_client *client = as5011->i2c_client; 163 struct i2c_client *client = as5011->i2c_client;
@@ -225,8 +225,8 @@ static int __devinit as5011_configure_chip(struct as5011_device *as5011,
225 return 0; 225 return 0;
226} 226}
227 227
228static int __devinit as5011_probe(struct i2c_client *client, 228static int as5011_probe(struct i2c_client *client,
229 const struct i2c_device_id *id) 229 const struct i2c_device_id *id)
230{ 230{
231 const struct as5011_platform_data *plat_data; 231 const struct as5011_platform_data *plat_data;
232 struct as5011_device *as5011; 232 struct as5011_device *as5011;
diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c
index c84345704258..5ff3cb4a6de3 100644
--- a/drivers/input/joystick/maplecontrol.c
+++ b/drivers/input/joystick/maplecontrol.c
@@ -78,7 +78,7 @@ static void dc_pad_close(struct input_dev *dev)
78} 78}
79 79
80/* allow the controller to be used */ 80/* allow the controller to be used */
81static int __devinit probe_maple_controller(struct device *dev) 81static int probe_maple_controller(struct device *dev)
82{ 82{
83 static const short btn_bit[32] = { 83 static const short btn_bit[32] = {
84 BTN_C, BTN_B, BTN_A, BTN_START, -1, -1, -1, -1, 84 BTN_C, BTN_B, BTN_A, BTN_START, -1, -1, -1, -1,