Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[mirror_ubuntu-artful-kernel.git] / drivers / gpio / gpio-da9052.c

diff --git a/drivers/gpio/gpio-da9052.c b/drivers/gpio/gpio-da9052.c
index 29b11e9b6a78600b2d14d61a178d5e1de3fdc2bc..9b77dc05d4ada6c6744040cf2cdfb5d76c3188a4 100644 (file)
--- a/drivers/gpio/gpio-da9052.c
+++ b/drivers/gpio/gpio-da9052.c
@@ -216,7 +216,7 @@ static int da9052_gpio_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        gpio->da9052 = dev_get_drvdata(pdev->dev.parent);
-       pdata = gpio->da9052->dev->platform_data;
+       pdata = dev_get_platdata(gpio->da9052->dev);
 
        gpio->gp = reference_gp;
        if (pdata && pdata->gpio_base)