fbdev: imxfb: Fix style warnings relating to printk()

Resolve the following warning reported by checkpatch:

WARNING: Prefer [subsystem eg: netdev]_err([subsystem]dev, ... then dev_err(dev, ... then pr_err(...  to printk(KERN_ERR ...

This made it necessary to move the 'fbi->pdev = pdev' setting to the
beginning of the driver's probing.

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
Signed-off-by: Helge Deller <deller@gmx.de>

diff --git a/drivers/video/fbdev/imxfb.c b/drivers/video/fbdev/imxfb.c
index ad293dc44dbb56cd7b0de520f515520af765e873..a0172ff75c46b525e50430600eec93650c31efb8 100644 (file)
--- a/drivers/video/fbdev/imxfb.c
+++ b/drivers/video/fbdev/imxfb.c
@@ -414,8 +414,8 @@ static int imxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
 
        if (--pcr > PCR_PCD_MASK) {
                pcr = PCR_PCD_MASK;
-               printk(KERN_WARNING "Must limit pixel clock to %luHz\n",
-                               lcd_clk / pcr);
+               dev_warn(&fbi->pdev->dev, "Must limit pixel clock to %luHz\n",
+                        lcd_clk / pcr);
        }
 
        switch (var->bits_per_pixel) {
@@ -628,28 +628,28 @@ static int imxfb_activate_var(struct fb_var_screeninfo *var, struct fb_info *inf
 
 #if DEBUG_VAR
        if (var->xres < 16        || var->xres > 1024)
-               printk(KERN_ERR "%s: invalid xres %d\n",
+               dev_err(&fbi->pdev->dev, "%s: invalid xres %d\n",
                        info->fix.id, var->xres);
        if (var->hsync_len < 1    || var->hsync_len > 64)
-               printk(KERN_ERR "%s: invalid hsync_len %d\n",
+               dev_err(&fbi->pdev->dev, "%s: invalid hsync_len %d\n",
                        info->fix.id, var->hsync_len);
        if (var->left_margin < left_margin_low  || var->left_margin > 255)
-               printk(KERN_ERR "%s: invalid left_margin %d\n",
+               dev_err(&fbi->pdev->dev, "%s: invalid left_margin %d\n",
                        info->fix.id, var->left_margin);
        if (var->right_margin < 1 || var->right_margin > 255)
-               printk(KERN_ERR "%s: invalid right_margin %d\n",
+               dev_err(&fbi->pdev->dev, "%s: invalid right_margin %d\n",
                        info->fix.id, var->right_margin);
        if (var->yres < 1 || var->yres > ymax_mask)
-               printk(KERN_ERR "%s: invalid yres %d\n",
+               dev_err(&fbi->pdev->dev, "%s: invalid yres %d\n",
                        info->fix.id, var->yres);
        if (var->vsync_len > 100)
-               printk(KERN_ERR "%s: invalid vsync_len %d\n",
+               dev_err(&fbi->pdev->dev, "%s: invalid vsync_len %d\n",
                        info->fix.id, var->vsync_len);
        if (var->upper_margin > 63)
-               printk(KERN_ERR "%s: invalid upper_margin %d\n",
+               dev_err(&fbi->pdev->dev, "%s: invalid upper_margin %d\n",
                        info->fix.id, var->upper_margin);
        if (var->lower_margin > 255)
-               printk(KERN_ERR "%s: invalid lower_margin %d\n",
+               dev_err(&fbi->pdev->dev, "%s: invalid lower_margin %d\n",
                        info->fix.id, var->lower_margin);
 #endif
 
@@ -701,6 +701,7 @@ static int imxfb_init_fbinfo(struct platform_device *pdev)
 
        memset(fbi, 0, sizeof(struct imxfb_info));
 
+       fbi->pdev = pdev;
        fbi->devtype = pdev->id_entry->driver_data;
 
        strscpy(info->fix.id, IMX_NAME, sizeof(info->fix.id));
@@ -1044,7 +1045,6 @@ static int imxfb_probe(struct platform_device *pdev)
        lcd->props.max_contrast = 0xff;
 
        imxfb_enable_controller(fbi);
-       fbi->pdev = pdev;
 
        return 0;