Merge tag 'acpi-5.1-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / gpio / gpio-dwapb.c

diff --git a/drivers/gpio/gpio-dwapb.c b/drivers/gpio/gpio-dwapb.c
index 044888fd96a1f642617cba9a9dfc98655c5493aa..84ae04402f7051de33ae7787235ad830c0dddb58 100644 (file)
--- a/drivers/gpio/gpio-dwapb.c
+++ b/drivers/gpio/gpio-dwapb.c
@@ -748,8 +748,7 @@ static int dwapb_gpio_remove(struct platform_device *pdev)
 #ifdef CONFIG_PM_SLEEP
 static int dwapb_gpio_suspend(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct dwapb_gpio *gpio = platform_get_drvdata(pdev);
+       struct dwapb_gpio *gpio = dev_get_drvdata(dev);
        struct gpio_chip *gc    = &gpio->ports[0].gc;
        unsigned long flags;
        int i;
@@ -793,8 +792,7 @@ static int dwapb_gpio_suspend(struct device *dev)
 
 static int dwapb_gpio_resume(struct device *dev)
 {
-       struct platform_device *pdev = to_platform_device(dev);
-       struct dwapb_gpio *gpio = platform_get_drvdata(pdev);
+       struct dwapb_gpio *gpio = dev_get_drvdata(dev);
        struct gpio_chip *gc    = &gpio->ports[0].gc;
        unsigned long flags;
        int i;