Merge branches '3.14/fbdev', '3.14/dss-misc' and '3.14/dss-fclk' into for-next

[firefly-linux-kernel-4.4.55.git] / drivers / video / sa1100fb.c

diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c
index de76da0c6429a942ca87e5e73841259371aff4b4..580c444ec301d3c3c58b6ca4ebba2dbb2e608b62 100644 (file)
--- a/drivers/video/sa1100fb.c
+++ b/drivers/video/sa1100fb.c
@@ -1116,7 +1116,7 @@ static struct fb_monspecs monspecs = {
 
 static struct sa1100fb_info *sa1100fb_init_fbinfo(struct device *dev)
 {
-       struct sa1100fb_mach_info *inf = dev->platform_data;
+       struct sa1100fb_mach_info *inf = dev_get_platdata(dev);
        struct sa1100fb_info *fbi;
        unsigned i;
 
@@ -1201,7 +1201,7 @@ static int sa1100fb_probe(struct platform_device *pdev)
        struct resource *res;
        int ret, irq;
 
-       if (!pdev->dev.platform_data) {
+       if (!dev_get_platdata(&pdev->dev)) {
                dev_err(&pdev->dev, "no platform LCD data\n");
                return -EINVAL;
        }