]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
gpio: gpio-omap: simplify getting .driver_data
authorWolfram Sang <wsa+renesas@sang-engineering.com>
Sun, 21 Oct 2018 19:59:59 +0000 (21:59 +0200)
committerLinus Walleij <linus.walleij@linaro.org>
Mon, 5 Nov 2018 07:54:41 +0000 (08:54 +0100)
We should get 'driver_data' from 'struct device' directly. Going via
platform_device is an unneeded step back and forth.

Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Acked-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
drivers/gpio/gpio-omap.c

index 9887c3db6e16ace91790fbb938452584512e45c5..6ed621a0056182f8b9c7e2af450c478e90c01b19 100644 (file)
@@ -984,8 +984,7 @@ omap4_gpio_disable_level_quirk(struct gpio_bank *bank)
 
 static int omap_mpuio_suspend_noirq(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct gpio_bank        *bank = platform_get_drvdata(pdev);
+       struct gpio_bank        *bank = dev_get_drvdata(dev);
        void __iomem            *mask_reg = bank->base +
                                        OMAP_MPUIO_GPIO_MASKIT / bank->stride;
        unsigned long           flags;
@@ -999,8 +998,7 @@ static int omap_mpuio_suspend_noirq(struct device *dev)
 
 static int omap_mpuio_resume_noirq(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct gpio_bank        *bank = platform_get_drvdata(pdev);
+       struct gpio_bank        *bank = dev_get_drvdata(dev);
        void __iomem            *mask_reg = bank->base +
                                        OMAP_MPUIO_GPIO_MASKIT / bank->stride;
        unsigned long           flags;
@@ -1688,8 +1686,7 @@ static void omap_gpio_restore_context(struct gpio_bank *bank)
 
 static int __maybe_unused omap_gpio_runtime_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct gpio_bank *bank = platform_get_drvdata(pdev);
+       struct gpio_bank *bank = dev_get_drvdata(dev);
        unsigned long flags;
        int error = 0;
 
@@ -1709,8 +1706,7 @@ static int __maybe_unused omap_gpio_runtime_suspend(struct device *dev)
 
 static int __maybe_unused omap_gpio_runtime_resume(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct gpio_bank *bank = platform_get_drvdata(pdev);
+       struct gpio_bank *bank = dev_get_drvdata(dev);
        unsigned long flags;
        int error = 0;