diff options
Diffstat (limited to 'drivers/input/keyboard/pmic8xxx-keypad.c')
| -rw-r--r-- | drivers/input/keyboard/pmic8xxx-keypad.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/keyboard/pmic8xxx-keypad.c b/drivers/input/keyboard/pmic8xxx-keypad.c index 52c34657d301..74339e139d43 100644 --- a/drivers/input/keyboard/pmic8xxx-keypad.c +++ b/drivers/input/keyboard/pmic8xxx-keypad.c | |||
| @@ -397,7 +397,7 @@ static irqreturn_t pmic8xxx_kp_irq(int irq, void *data) | |||
| 397 | return IRQ_HANDLED; | 397 | return IRQ_HANDLED; |
| 398 | } | 398 | } |
| 399 | 399 | ||
| 400 | static int __devinit pmic8xxx_kpd_init(struct pmic8xxx_kp *kp) | 400 | static int pmic8xxx_kpd_init(struct pmic8xxx_kp *kp) |
| 401 | { | 401 | { |
| 402 | int bits, rc, cycles; | 402 | int bits, rc, cycles; |
| 403 | u8 scan_val = 0, ctrl_val = 0; | 403 | u8 scan_val = 0, ctrl_val = 0; |
| @@ -447,7 +447,7 @@ static int __devinit pmic8xxx_kpd_init(struct pmic8xxx_kp *kp) | |||
| 447 | 447 | ||
| 448 | } | 448 | } |
| 449 | 449 | ||
| 450 | static int __devinit pmic8xxx_kp_config_gpio(int gpio_start, int num_gpios, | 450 | static int pmic8xxx_kp_config_gpio(int gpio_start, int num_gpios, |
| 451 | struct pmic8xxx_kp *kp, struct pm_gpio *gpio_config) | 451 | struct pmic8xxx_kp *kp, struct pm_gpio *gpio_config) |
| 452 | { | 452 | { |
| 453 | int rc, i; | 453 | int rc, i; |
| @@ -518,7 +518,7 @@ static void pmic8xxx_kp_close(struct input_dev *dev) | |||
| 518 | * - set irq edge type. | 518 | * - set irq edge type. |
| 519 | * - enable the keypad controller. | 519 | * - enable the keypad controller. |
| 520 | */ | 520 | */ |
| 521 | static int __devinit pmic8xxx_kp_probe(struct platform_device *pdev) | 521 | static int pmic8xxx_kp_probe(struct platform_device *pdev) |
| 522 | { | 522 | { |
| 523 | const struct pm8xxx_keypad_platform_data *pdata = | 523 | const struct pm8xxx_keypad_platform_data *pdata = |
| 524 | dev_get_platdata(&pdev->dev); | 524 | dev_get_platdata(&pdev->dev); |
| @@ -712,7 +712,7 @@ err_alloc_device: | |||
| 712 | return rc; | 712 | return rc; |
| 713 | } | 713 | } |
| 714 | 714 | ||
| 715 | static int __devexit pmic8xxx_kp_remove(struct platform_device *pdev) | 715 | static int pmic8xxx_kp_remove(struct platform_device *pdev) |
| 716 | { | 716 | { |
| 717 | struct pmic8xxx_kp *kp = platform_get_drvdata(pdev); | 717 | struct pmic8xxx_kp *kp = platform_get_drvdata(pdev); |
| 718 | 718 | ||
| @@ -773,7 +773,7 @@ static SIMPLE_DEV_PM_OPS(pm8xxx_kp_pm_ops, | |||
| 773 | 773 | ||
| 774 | static struct platform_driver pmic8xxx_kp_driver = { | 774 | static struct platform_driver pmic8xxx_kp_driver = { |
| 775 | .probe = pmic8xxx_kp_probe, | 775 | .probe = pmic8xxx_kp_probe, |
| 776 | .remove = __devexit_p(pmic8xxx_kp_remove), | 776 | .remove = pmic8xxx_kp_remove, |
| 777 | .driver = { | 777 | .driver = { |
| 778 | .name = PM8XXX_KEYPAD_DEV_NAME, | 778 | .name = PM8XXX_KEYPAD_DEV_NAME, |
| 779 | .owner = THIS_MODULE, | 779 | .owner = THIS_MODULE, |