Merge branch 'fortglx/3.14/time' of git://git.linaro.org/people/john.stultz/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / ata / pata_pxa.c

diff --git a/drivers/ata/pata_pxa.c b/drivers/ata/pata_pxa.c
index 942ef94b29e6658a115935c64cc3e81bdf8c1e6b..a6f05acad61ed01d68b0ec201698a8abc406cf44 100644 (file)
--- a/drivers/ata/pata_pxa.c
+++ b/drivers/ata/pata_pxa.c
@@ -238,7 +238,7 @@ static int pxa_ata_probe(struct platform_device *pdev)
        struct resource *ctl_res;
        struct resource *dma_res;
        struct resource *irq_res;
-       struct pata_pxa_pdata *pdata = pdev->dev.platform_data;
+       struct pata_pxa_pdata *pdata = dev_get_platdata(&pdev->dev);
        int ret = 0;
 
        /*