diff options
Diffstat (limited to 'drivers/input/keyboard/adp5588-keys.c')
-rw-r--r-- | drivers/input/keyboard/adp5588-keys.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/keyboard/adp5588-keys.c b/drivers/input/keyboard/adp5588-keys.c index 39c2a6d2c99f..a20fe70ffa83 100644 --- a/drivers/input/keyboard/adp5588-keys.c +++ b/drivers/input/keyboard/adp5588-keys.c | |||
@@ -145,7 +145,7 @@ static int adp5588_gpio_direction_output(struct gpio_chip *chip, | |||
145 | return ret; | 145 | return ret; |
146 | } | 146 | } |
147 | 147 | ||
148 | static int __devinit adp5588_build_gpiomap(struct adp5588_kpad *kpad, | 148 | static int adp5588_build_gpiomap(struct adp5588_kpad *kpad, |
149 | const struct adp5588_kpad_platform_data *pdata) | 149 | const struct adp5588_kpad_platform_data *pdata) |
150 | { | 150 | { |
151 | bool pin_used[ADP5588_MAXGPIO]; | 151 | bool pin_used[ADP5588_MAXGPIO]; |
@@ -170,7 +170,7 @@ static int __devinit adp5588_build_gpiomap(struct adp5588_kpad *kpad, | |||
170 | return n_unused; | 170 | return n_unused; |
171 | } | 171 | } |
172 | 172 | ||
173 | static int __devinit adp5588_gpio_add(struct adp5588_kpad *kpad) | 173 | static int adp5588_gpio_add(struct adp5588_kpad *kpad) |
174 | { | 174 | { |
175 | struct device *dev = &kpad->client->dev; | 175 | struct device *dev = &kpad->client->dev; |
176 | const struct adp5588_kpad_platform_data *pdata = dev->platform_data; | 176 | const struct adp5588_kpad_platform_data *pdata = dev->platform_data; |
@@ -319,7 +319,7 @@ static irqreturn_t adp5588_irq(int irq, void *handle) | |||
319 | return IRQ_HANDLED; | 319 | return IRQ_HANDLED; |
320 | } | 320 | } |
321 | 321 | ||
322 | static int __devinit adp5588_setup(struct i2c_client *client) | 322 | static int adp5588_setup(struct i2c_client *client) |
323 | { | 323 | { |
324 | const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data; | 324 | const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data; |
325 | const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data; | 325 | const struct adp5588_gpio_platform_data *gpio_data = pdata->gpio_data; |
@@ -382,7 +382,7 @@ static int __devinit adp5588_setup(struct i2c_client *client) | |||
382 | return 0; | 382 | return 0; |
383 | } | 383 | } |
384 | 384 | ||
385 | static void __devinit adp5588_report_switch_state(struct adp5588_kpad *kpad) | 385 | static void adp5588_report_switch_state(struct adp5588_kpad *kpad) |
386 | { | 386 | { |
387 | int gpi_stat1 = adp5588_read(kpad->client, GPIO_DAT_STAT1); | 387 | int gpi_stat1 = adp5588_read(kpad->client, GPIO_DAT_STAT1); |
388 | int gpi_stat2 = adp5588_read(kpad->client, GPIO_DAT_STAT2); | 388 | int gpi_stat2 = adp5588_read(kpad->client, GPIO_DAT_STAT2); |
@@ -420,8 +420,8 @@ static void __devinit adp5588_report_switch_state(struct adp5588_kpad *kpad) | |||
420 | } | 420 | } |
421 | 421 | ||
422 | 422 | ||
423 | static int __devinit adp5588_probe(struct i2c_client *client, | 423 | static int adp5588_probe(struct i2c_client *client, |
424 | const struct i2c_device_id *id) | 424 | const struct i2c_device_id *id) |
425 | { | 425 | { |
426 | struct adp5588_kpad *kpad; | 426 | struct adp5588_kpad *kpad; |
427 | const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data; | 427 | const struct adp5588_kpad_platform_data *pdata = client->dev.platform_data; |