aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard/adp5589-keys.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/keyboard/adp5589-keys.c')
-rw-r--r--drivers/input/keyboard/adp5589-keys.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c
index 6e0c2e3a6a8..8f591da17de 100644
--- a/drivers/input/keyboard/adp5589-keys.c
+++ b/drivers/input/keyboard/adp5589-keys.c
@@ -464,7 +464,7 @@ static int adp5589_gpio_direction_output(struct gpio_chip *chip,
464 return ret; 464 return ret;
465} 465}
466 466
467static int __devinit adp5589_build_gpiomap(struct adp5589_kpad *kpad, 467static int adp5589_build_gpiomap(struct adp5589_kpad *kpad,
468 const struct adp5589_kpad_platform_data *pdata) 468 const struct adp5589_kpad_platform_data *pdata)
469{ 469{
470 bool pin_used[ADP5589_MAXGPIO]; 470 bool pin_used[ADP5589_MAXGPIO];
@@ -496,7 +496,7 @@ static int __devinit adp5589_build_gpiomap(struct adp5589_kpad *kpad,
496 return n_unused; 496 return n_unused;
497} 497}
498 498
499static int __devinit adp5589_gpio_add(struct adp5589_kpad *kpad) 499static int adp5589_gpio_add(struct adp5589_kpad *kpad)
500{ 500{
501 struct device *dev = &kpad->client->dev; 501 struct device *dev = &kpad->client->dev;
502 const struct adp5589_kpad_platform_data *pdata = dev->platform_data; 502 const struct adp5589_kpad_platform_data *pdata = dev->platform_data;
@@ -641,8 +641,7 @@ static irqreturn_t adp5589_irq(int irq, void *handle)
641 return IRQ_HANDLED; 641 return IRQ_HANDLED;
642} 642}
643 643
644static int __devinit adp5589_get_evcode(struct adp5589_kpad *kpad, 644static int adp5589_get_evcode(struct adp5589_kpad *kpad, unsigned short key)
645 unsigned short key)
646{ 645{
647 int i; 646 int i;
648 647
@@ -655,7 +654,7 @@ static int __devinit adp5589_get_evcode(struct adp5589_kpad *kpad,
655 return -EINVAL; 654 return -EINVAL;
656} 655}
657 656
658static int __devinit adp5589_setup(struct adp5589_kpad *kpad) 657static int adp5589_setup(struct adp5589_kpad *kpad)
659{ 658{
660 struct i2c_client *client = kpad->client; 659 struct i2c_client *client = kpad->client;
661 const struct adp5589_kpad_platform_data *pdata = 660 const struct adp5589_kpad_platform_data *pdata =
@@ -820,7 +819,7 @@ static int __devinit adp5589_setup(struct adp5589_kpad *kpad)
820 return 0; 819 return 0;
821} 820}
822 821
823static void __devinit adp5589_report_switch_state(struct adp5589_kpad *kpad) 822static void adp5589_report_switch_state(struct adp5589_kpad *kpad)
824{ 823{
825 int gpi_stat_tmp, pin_loc; 824 int gpi_stat_tmp, pin_loc;
826 int i; 825 int i;
@@ -860,8 +859,8 @@ static void __devinit adp5589_report_switch_state(struct adp5589_kpad *kpad)
860 input_sync(kpad->input); 859 input_sync(kpad->input);
861} 860}
862 861
863static int __devinit adp5589_probe(struct i2c_client *client, 862static int adp5589_probe(struct i2c_client *client,
864 const struct i2c_device_id *id) 863 const struct i2c_device_id *id)
865{ 864{
866 struct adp5589_kpad *kpad; 865 struct adp5589_kpad *kpad;
867 const struct adp5589_kpad_platform_data *pdata = 866 const struct adp5589_kpad_platform_data *pdata =