Input: keyboard: Use dev_get_drv_data
Subsystems (6)
PATCH 1/1 Input: keyboard: Use dev_get_drv_data
dev_get_drvdata is a simpler implementation comparing to to_platform_device + platform_get_drvdata. This makes the code simpler.
Signed-off-by Chuhong Yuan <[email protected]>
--- drivers/input/keyboard/ep93xx_keypad.c | 10 ++++------ drivers/input/keyboard/gpio_keys.c | 3 +-- drivers/input/keyboard/imx_keypad.c | 10 ++++------ drivers/input/keyboard/lpc32xx-keys.c | 6 ++---- drivers/input/keyboard/matrix_keypad.c | 10 ++++------ drivers/input/keyboard/omap4-keypad.c | 10 ++++------ drivers/input/keyboard/pmic8xxx-keypad.c | 6 ++---- drivers/input/keyboard/pxa27x_keypad.c | 10 ++++------ drivers/input/keyboard/samsung-keypad.c | 12 ++++-------- drivers/input/keyboard/spear-keyboard.c | 10 ++++------ drivers/input/keyboard/st-keyscan.c | 6 ++---- drivers/input/keyboard/tegra-kbc.c | 10 ++++------ 12 files changed, 39 insertions(+), 64 deletions(-)
drivers/input/keyboard/ep93xx_keypad.c +4 -6
@@ -178,8 +178,7 @@ static void ep93xx_keypad_close(struct input_dev *pdev)#ifdef CONFIG_PM_SLEEP static int ep93xx_keypad_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct ep93xx_keypad *keypad =platform_get_drvdata (pdev); +struct ep93xx_keypad *keypad =dev_get_drvdata (dev);struct input_dev *input_dev = keypad->input_dev;mutex_lock (&input_dev->mutex);
@@ -191,7 +190,7 @@ static int ep93xx_keypad_suspend(struct device *dev)mutex_unlock (&input_dev->mutex); -if (device_may_wakeup (&pdev->dev)) +if (device_may_wakeup (dev))enable_irq_wake (keypad->irq);return 0 ;
@@ -199,11 +198,10 @@ static int ep93xx_keypad_suspend(struct device *dev)static int ep93xx_keypad_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct ep93xx_keypad *keypad =platform_get_drvdata (pdev); +struct ep93xx_keypad *keypad =dev_get_drvdata (dev);struct input_dev *input_dev = keypad->input_dev; -if (device_may_wakeup (&pdev->dev)) +if (device_may_wakeup (dev))disable_irq_wake (keypad->irq);mutex_lock (&input_dev->mutex);
drivers/input/keyboard/gpio_keys.c +1 -2
@@ -290,8 +290,7 @@ static ssize_t gpio_keys_show_##name(struct device *dev, \struct device_attribute *attr, \ char *buf) \ { \ - struct platform_device *pdev = to_platform_device(dev); \ -struct gpio_keys_drvdata *ddata =platform_get_drvdata (pdev); \ + struct gpio_keys_drvdata *ddata = dev_get_drvdata(dev); \ \return gpio_keys_attr_show_helper (ddata, buf, \ type, only_disabled); \
drivers/input/keyboard/imx_keypad.c +4 -6
@@ -526,8 +526,7 @@ static int imx_keypad_probe(struct platform_device *pdev)static int __maybe_unused imx_kbd_noirq_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct imx_keypad *kbd =platform_get_drvdata (pdev); +struct imx_keypad *kbd =dev_get_drvdata (dev);struct input_dev *input_dev = kbd->input_dev;unsigned short reg_val =readw (kbd->mmio_base +KPSR );
@@ -539,7 +538,7 @@ static int __maybe_unused imx_kbd_noirq_suspend(struct device *dev)mutex_unlock (&input_dev->mutex); -if (device_may_wakeup (&pdev->dev)) { +if (device_may_wakeup (dev)) {if (reg_val &KBD_STAT_KPKD ) reg_val |=KBD_STAT_KRIE ;if (reg_val &KBD_STAT_KPKR )
@@ -554,12 +553,11 @@ static int __maybe_unused imx_kbd_noirq_suspend(struct device *dev)static int __maybe_unused imx_kbd_noirq_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct imx_keypad *kbd =platform_get_drvdata (pdev); +struct imx_keypad *kbd =dev_get_drvdata (dev);struct input_dev *input_dev = kbd->input_dev;int ret =0 ; -if (device_may_wakeup (&pdev->dev)) +if (device_may_wakeup (dev))disable_irq_wake (kbd->irq);mutex_lock (&input_dev->mutex);
drivers/input/keyboard/lpc32xx-keys.c +2 -4
@@ -269,8 +269,7 @@ static int lpc32xx_kscan_probe(struct platform_device *pdev)#ifdef CONFIG_PM_SLEEP static int lpc32xx_kscan_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct lpc32xx_kscan_drv *kscandat =platform_get_drvdata (pdev); +struct lpc32xx_kscan_drv *kscandat =dev_get_drvdata (dev);struct input_dev *input = kscandat->input;mutex_lock (&input->mutex);
@@ -287,8 +286,7 @@ static int lpc32xx_kscan_suspend(struct device *dev)static int lpc32xx_kscan_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct lpc32xx_kscan_drv *kscandat =platform_get_drvdata (pdev); +struct lpc32xx_kscan_drv *kscandat =dev_get_drvdata (dev);struct input_dev *input = kscandat->input;int retval =0 ;
drivers/input/keyboard/matrix_keypad.c +4 -6
@@ -272,12 +272,11 @@ static void matrix_keypad_disable_wakeup(struct matrix_keypad *keypad)static int matrix_keypad_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct matrix_keypad *keypad =platform_get_drvdata (pdev); +struct matrix_keypad *keypad =dev_get_drvdata (dev);matrix_keypad_stop (keypad->input_dev); -if (device_may_wakeup (&pdev->dev)) +if (device_may_wakeup (dev))matrix_keypad_enable_wakeup (keypad);return 0 ;
@@ -285,10 +284,9 @@ static int matrix_keypad_suspend(struct device *dev)static int matrix_keypad_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct matrix_keypad *keypad =platform_get_drvdata (pdev); +struct matrix_keypad *keypad =dev_get_drvdata (dev); -if (device_may_wakeup (&pdev->dev)) +if (device_may_wakeup (dev))matrix_keypad_disable_wakeup (keypad);matrix_keypad_start (keypad->input_dev);
drivers/input/keyboard/omap4-keypad.c +4 -6
@@ -412,11 +412,10 @@ MODULE_DEVICE_TABLE(of, omap_keypad_dt_match);#ifdef CONFIG_PM_SLEEP static int omap4_keypad_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct omap4_keypad *keypad_data =platform_get_drvdata (pdev); +struct omap4_keypad *keypad_data =dev_get_drvdata (dev);int error; -if (device_may_wakeup (&pdev->dev)) { +if (device_may_wakeup (dev)) { error =enable_irq_wake (keypad_data->irq);if (!error) keypad_data->irq_wake_enabled = true;
@@ -427,10 +426,9 @@ static int omap4_keypad_suspend(struct device *dev)static int omap4_keypad_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct omap4_keypad *keypad_data =platform_get_drvdata (pdev); +struct omap4_keypad *keypad_data =dev_get_drvdata (dev); -if (device_may_wakeup (&pdev->dev) && keypad_data->irq_wake_enabled) { +if (device_may_wakeup (dev) && keypad_data->irq_wake_enabled) {disable_irq_wake (keypad_data->irq); keypad_data->irq_wake_enabled = false; }
drivers/input/keyboard/pmic8xxx-keypad.c +2 -4
@@ -628,8 +628,7 @@ static int pmic8xxx_kp_probe(struct platform_device *pdev)#ifdef CONFIG_PM_SLEEP static int pmic8xxx_kp_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct pmic8xxx_kp *kp =platform_get_drvdata (pdev); +struct pmic8xxx_kp *kp =dev_get_drvdata (dev);struct input_dev *input_dev = kp->input;if (device_may_wakeup (dev)) {
@@ -648,8 +647,7 @@ static int pmic8xxx_kp_suspend(struct device *dev)static int pmic8xxx_kp_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct pmic8xxx_kp *kp =platform_get_drvdata (pdev); +struct pmic8xxx_kp *kp =dev_get_drvdata (dev);struct input_dev *input_dev = kp->input;if (device_may_wakeup (dev)) {
drivers/input/keyboard/pxa27x_keypad.c +4 -6
@@ -663,14 +663,13 @@ static void pxa27x_keypad_close(struct input_dev *dev)#ifdef CONFIG_PM_SLEEP static int pxa27x_keypad_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct pxa27x_keypad *keypad =platform_get_drvdata (pdev); +struct pxa27x_keypad *keypad =dev_get_drvdata (dev);/* * If the keypad is used a wake up source, clock can not be disabled. * Or it can not detect the key pressing. */ -if (device_may_wakeup (&pdev->dev)) +if (device_may_wakeup (dev))enable_irq_wake (keypad->irq);else clk_disable_unprepare (keypad->clk);
@@ -680,8 +679,7 @@ static int pxa27x_keypad_suspend(struct device *dev)static int pxa27x_keypad_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct pxa27x_keypad *keypad =platform_get_drvdata (pdev); +struct pxa27x_keypad *keypad =dev_get_drvdata (dev);struct input_dev *input_dev = keypad->input_dev;int ret =0 ;
@@ -689,7 +687,7 @@ static int pxa27x_keypad_resume(struct device *dev)* If the keypad is used as wake up source, the clock is not turned * off. So do not need configure it again. */ -if (device_may_wakeup (&pdev->dev)) { +if (device_may_wakeup (dev)) {disable_irq_wake (keypad->irq); }else {mutex_lock (&input_dev->mutex);
drivers/input/keyboard/samsung-keypad.c +4 -8
@@ -462,8 +462,7 @@ static int samsung_keypad_remove(struct platform_device *pdev)#ifdef CONFIG_PM static int samsung_keypad_runtime_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct samsung_keypad *keypad =platform_get_drvdata (pdev); +struct samsung_keypad *keypad =dev_get_drvdata (dev);unsigned int val;int error;
@@ -486,8 +485,7 @@ static int samsung_keypad_runtime_suspend(struct device *dev)static int samsung_keypad_runtime_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct samsung_keypad *keypad =platform_get_drvdata (pdev); +struct samsung_keypad *keypad =dev_get_drvdata (dev);unsigned int val;if (keypad->stopped)
@@ -531,8 +529,7 @@ static void samsung_keypad_toggle_wakeup(struct samsung_keypad *keypad,static int samsung_keypad_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct samsung_keypad *keypad =platform_get_drvdata (pdev); +struct samsung_keypad *keypad =dev_get_drvdata (dev);struct input_dev *input_dev = keypad->input_dev;mutex_lock (&input_dev->mutex);
@@ -549,8 +546,7 @@ static int samsung_keypad_suspend(struct device *dev)static int samsung_keypad_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct samsung_keypad *keypad =platform_get_drvdata (pdev); +struct samsung_keypad *keypad =dev_get_drvdata (dev);struct input_dev *input_dev = keypad->input_dev;mutex_lock (&input_dev->mutex);
drivers/input/keyboard/spear-keyboard.c +4 -6
@@ -288,8 +288,7 @@ static int spear_kbd_remove(struct platform_device *pdev)static int __maybe_unused spear_kbd_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct spear_kbd *kbd =platform_get_drvdata (pdev); +struct spear_kbd *kbd =dev_get_drvdata (dev);struct input_dev *input_dev = kbd->input;unsigned int rate =0 , mode_ctl_reg, val;
@@ -300,7 +299,7 @@ static int __maybe_unused spear_kbd_suspend(struct device *dev) mode_ctl_reg =readl_relaxed (kbd->io_base +MODE_CTL_REG ); -if (device_may_wakeup (&pdev->dev)) { +if (device_may_wakeup (dev)) {if (!enable_irq_wake (kbd->irq)) kbd->irq_wake_enabled = true;
@@ -341,13 +340,12 @@ static int __maybe_unused spear_kbd_suspend(struct device *dev)static int __maybe_unused spear_kbd_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct spear_kbd *kbd =platform_get_drvdata (pdev); +struct spear_kbd *kbd =dev_get_drvdata (dev);struct input_dev *input_dev = kbd->input;mutex_lock (&input_dev->mutex); -if (device_may_wakeup (&pdev->dev)) { +if (device_may_wakeup (dev)) {if (kbd->irq_wake_enabled) { kbd->irq_wake_enabled = false;disable_irq_wake (kbd->irq);
drivers/input/keyboard/st-keyscan.c +2 -4
@@ -215,8 +215,7 @@ static int keyscan_probe(struct platform_device *pdev)#ifdef CONFIG_PM_SLEEP static int keyscan_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct st_keyscan *keypad =platform_get_drvdata (pdev); +struct st_keyscan *keypad =dev_get_drvdata (dev);struct input_dev *input = keypad->input_dev;mutex_lock (&input->mutex);
@@ -232,8 +231,7 @@ static int keyscan_suspend(struct device *dev)static int keyscan_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct st_keyscan *keypad =platform_get_drvdata (pdev); +struct st_keyscan *keypad =dev_get_drvdata (dev);struct input_dev *input = keypad->input_dev;int retval =0 ;
drivers/input/keyboard/tegra-kbc.c +4 -6
@@ -731,11 +731,10 @@ static void tegra_kbc_set_keypress_interrupt(struct tegra_kbc *kbc, bool enable)static int tegra_kbc_suspend (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct tegra_kbc *kbc =platform_get_drvdata (pdev); +struct tegra_kbc *kbc =dev_get_drvdata (dev);mutex_lock (&kbc->idev->mutex); -if (device_may_wakeup (&pdev->dev)) { +if (device_may_wakeup (dev)) {disable_irq (kbc->irq);del_timer_sync (&kbc->timer);tegra_kbc_set_fifo_interrupt (kbc, false);
@@ -768,12 +767,11 @@ static int tegra_kbc_suspend(struct device *dev)static int tegra_kbc_resume (struct device *dev) { -struct platform_device *pdev =to_platform_device (dev); -struct tegra_kbc *kbc =platform_get_drvdata (pdev); +struct tegra_kbc *kbc =dev_get_drvdata (dev);int err =0 ;mutex_lock (&kbc->idev->mutex); -if (device_may_wakeup (&pdev->dev)) { +if (device_may_wakeup (dev)) {disable_irq_wake (kbc->irq);tegra_kbc_setup_wakekeys (kbc, false);/* We will use fifo interrupts for key detection. */
Signature · 1 line
2.20.1