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

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

diff --git a/drivers/video/nuc900fb.c b/drivers/video/nuc900fb.c
index 796e5112ceeeb1f139bf947197e96ea2af42ee60..478f9808dee4abbea8215ab09cf463453a9af8df 100644 (file)
--- a/drivers/video/nuc900fb.c
+++ b/drivers/video/nuc900fb.c
@@ -91,7 +91,7 @@ static int nuc900fb_check_var(struct fb_var_screeninfo *var,
                               struct fb_info *info)
 {
        struct nuc900fb_info *fbi = info->par;
-       struct nuc900fb_mach_info *mach_info = fbi->dev->platform_data;
+       struct nuc900fb_mach_info *mach_info = dev_get_platdata(fbi->dev);
        struct nuc900fb_display *display = NULL;
        struct nuc900fb_display *default_display = mach_info->displays +
                                                   mach_info->default_display;
@@ -358,7 +358,7 @@ static inline void modify_gpio(void __iomem *reg,
 static int nuc900fb_init_registers(struct fb_info *info)
 {
        struct nuc900fb_info *fbi = info->par;
-       struct nuc900fb_mach_info *mach_info = fbi->dev->platform_data;
+       struct nuc900fb_mach_info *mach_info = dev_get_platdata(fbi->dev);
        void __iomem *regs = fbi->io;
 
        /*reset the display engine*/
@@ -512,7 +512,7 @@ static int nuc900fb_probe(struct platform_device *pdev)
        int size;
 
        dev_dbg(&pdev->dev, "devinit\n");
-       mach_info = pdev->dev.platform_data;
+       mach_info = dev_get_platdata(&pdev->dev);
        if (mach_info == NULL) {
                dev_err(&pdev->dev,
                        "no platform data for lcd, cannot attach\n");
@@ -647,8 +647,7 @@ static int nuc900fb_probe(struct platform_device *pdev)
                goto free_cpufreq;
        }
 
-       printk(KERN_INFO "fb%d: %s frame buffer device\n",
-               fbinfo->node, fbinfo->fix.id);
+       fb_info(fbinfo, "%s frame buffer device\n", fbinfo->fix.id);
 
        return 0;