Merge tag 'stable/for-linus-3.12-rc0-tag-two' of git://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / gpio / gpio-pl061.c

diff --git a/drivers/gpio/gpio-pl061.c b/drivers/gpio/gpio-pl061.c
index 6a4bd0dae0ceb9c3d2d6f7c020c273f0fb269618..4274e2e70ef8e8e31fcdb6da0370ae265f383190 100644 (file)
--- a/drivers/gpio/gpio-pl061.c
+++ b/drivers/gpio/gpio-pl061.c
@@ -259,7 +259,7 @@ static const struct irq_domain_ops pl061_domain_ops = {
 static int pl061_probe(struct amba_device *adev, const struct amba_id *id)
 {
        struct device *dev = &adev->dev;
-       struct pl061_platform_data *pdata = dev->platform_data;
+       struct pl061_platform_data *pdata = dev_get_platdata(dev);
        struct pl061_gpio *chip;
        int ret, irq, i, irq_base;