aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/input/keyboard/tegra-kbc.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/input/keyboard/tegra-kbc.c')
-rw-r--r--drivers/input/keyboard/tegra-kbc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/tegra-kbc.c b/drivers/input/keyboard/tegra-kbc.c
index 0bbcf971d103..cf8ab689231b 100644
--- a/drivers/input/keyboard/tegra-kbc.c
+++ b/drivers/input/keyboard/tegra-kbc.c
@@ -573,7 +573,7 @@ static void tegra_kbc_close(struct input_dev *dev)
573 return tegra_kbc_stop(kbc); 573 return tegra_kbc_stop(kbc);
574} 574}
575 575
576static bool __devinit 576static bool
577tegra_kbc_check_pin_cfg(const struct tegra_kbc_platform_data *pdata, 577tegra_kbc_check_pin_cfg(const struct tegra_kbc_platform_data *pdata,
578 struct device *dev, unsigned int *num_rows) 578 struct device *dev, unsigned int *num_rows)
579{ 579{
@@ -619,7 +619,7 @@ tegra_kbc_check_pin_cfg(const struct tegra_kbc_platform_data *pdata,
619} 619}
620 620
621#ifdef CONFIG_OF 621#ifdef CONFIG_OF
622static struct tegra_kbc_platform_data * __devinit tegra_kbc_dt_parse_pdata( 622static struct tegra_kbc_platform_data *tegra_kbc_dt_parse_pdata(
623 struct platform_device *pdev) 623 struct platform_device *pdev)
624{ 624{
625 struct tegra_kbc_platform_data *pdata; 625 struct tegra_kbc_platform_data *pdata;
@@ -670,7 +670,7 @@ static inline struct tegra_kbc_platform_data *tegra_kbc_dt_parse_pdata(
670} 670}
671#endif 671#endif
672 672
673static int __devinit tegra_kbd_setup_keymap(struct tegra_kbc *kbc) 673static int tegra_kbd_setup_keymap(struct tegra_kbc *kbc)
674{ 674{
675 const struct tegra_kbc_platform_data *pdata = kbc->pdata; 675 const struct tegra_kbc_platform_data *pdata = kbc->pdata;
676 const struct matrix_keymap_data *keymap_data = pdata->keymap_data; 676 const struct matrix_keymap_data *keymap_data = pdata->keymap_data;
@@ -697,7 +697,7 @@ static int __devinit tegra_kbd_setup_keymap(struct tegra_kbc *kbc)
697 return retval; 697 return retval;
698} 698}
699 699
700static int __devinit tegra_kbc_probe(struct platform_device *pdev) 700static int tegra_kbc_probe(struct platform_device *pdev)
701{ 701{
702 const struct tegra_kbc_platform_data *pdata = pdev->dev.platform_data; 702 const struct tegra_kbc_platform_data *pdata = pdev->dev.platform_data;
703 struct tegra_kbc *kbc; 703 struct tegra_kbc *kbc;