drivers/video/backlight/jornada720_*.c: use dev_err()/dev_info() instead of pr_err...

dev_err()/dev_info() are preferred to pr_err()/pr_info().

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
index fef6ce4fad7168b3c16fc17ae2efb83e2ba443de..3ccb89340f22644e8cfac83c0a4b9eebe37cc55d 100644 (file)
--- a/drivers/video/backlight/jornada720_bl.c
+++ b/drivers/video/backlight/jornada720_bl.c
@@ -9,8 +9,6 @@
  *
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/backlight.h>
 #include <linux/device.h>
 #include <linux/fb.h>
@@ -40,11 +38,13 @@ static int jornada_bl_get_brightness(struct backlight_device *bd)
        ret = jornada_ssp_byte(GETBRIGHTNESS);
 
        if (jornada_ssp_byte(GETBRIGHTNESS) != TXDUMMY) {
-               pr_err("get brightness timeout\n");
+               dev_err(&bd->dev, "get brightness timeout\n");
                jornada_ssp_end();
                return -ETIMEDOUT;
-       } else /* exchange txdummy for value */
+       } else {
+               /* exchange txdummy for value */
                ret = jornada_ssp_byte(TXDUMMY);
+       }
 
        jornada_ssp_end();
 
@@ -61,7 +61,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
        if ((bd->props.power != FB_BLANK_UNBLANK) || (bd->props.fb_blank != FB_BLANK_UNBLANK)) {
                ret = jornada_ssp_byte(BRIGHTNESSOFF);
                if (ret != TXDUMMY) {
-                       pr_info("brightness off timeout\n");
+                       dev_info(&bd->dev, "brightness off timeout\n");
                        /* turn off backlight */
                        PPSR &= ~PPC_LDD1;
                        PPDR |= PPC_LDD1;
@@ -72,7 +72,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
 
                /* send command to our mcu */
                if (jornada_ssp_byte(SETBRIGHTNESS) != TXDUMMY) {
-                       pr_info("failed to set brightness\n");
+                       dev_info(&bd->dev, "failed to set brightness\n");
                        ret = -ETIMEDOUT;
                        goto out;
                }
@@ -86,7 +86,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
                 */
                if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness)
                        != TXDUMMY) {
-                       pr_err("set brightness failed\n");
+                       dev_err(&bd->dev, "set brightness failed\n");
                        ret = -ETIMEDOUT;
                }
 
@@ -120,7 +120,7 @@ static int jornada_bl_probe(struct platform_device *pdev)
 
        if (IS_ERR(bd)) {
                ret = PTR_ERR(bd);
-               pr_err("failed to register device, err=%x\n", ret);
+               dev_err(&pdev->dev, "failed to register device, err=%x\n", ret);
                return ret;
        }
 
@@ -134,7 +134,7 @@ static int jornada_bl_probe(struct platform_device *pdev)
        jornada_bl_update_status(bd);
 
        platform_set_drvdata(pdev, bd);
-       pr_info("HP Jornada 700 series backlight driver\n");
+       dev_info(&pdev->dev, "HP Jornada 700 series backlight driver\n");
 
        return 0;
 }

diff --git a/drivers/video/backlight/jornada720_lcd.c b/drivers/video/backlight/jornada720_lcd.c
index 635b30523fd598556f674ff31c8d46031475718f..b061413f1a65c8968ef47542623c6d7f3a6028af 100644 (file)
--- a/drivers/video/backlight/jornada720_lcd.c
+++ b/drivers/video/backlight/jornada720_lcd.c
@@ -9,8 +9,6 @@
  *
  */
 
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
 #include <linux/device.h>
 #include <linux/fb.h>
 #include <linux/kernel.h>
@@ -27,7 +25,7 @@
 #define LCD_MAX_CONTRAST       0xff
 #define LCD_DEF_CONTRAST       0x80
 
-static int jornada_lcd_get_power(struct lcd_device *dev)
+static int jornada_lcd_get_power(struct lcd_device *ld)
 {
        /* LDD2 in PPC = LCD POWER */
        if (PPSR & PPC_LDD2)
@@ -36,17 +34,17 @@ static int jornada_lcd_get_power(struct lcd_device *dev)
                return FB_BLANK_POWERDOWN;      /* PW OFF */
 }
 
-static int jornada_lcd_get_contrast(struct lcd_device *dev)
+static int jornada_lcd_get_contrast(struct lcd_device *ld)
 {
        int ret;
 
-       if (jornada_lcd_get_power(dev) != FB_BLANK_UNBLANK)
+       if (jornada_lcd_get_power(ld) != FB_BLANK_UNBLANK)
                return 0;
 
        jornada_ssp_start();
 
        if (jornada_ssp_byte(GETCONTRAST) != TXDUMMY) {
-               pr_err("get contrast failed\n");
+               dev_err(&ld->dev, "get contrast failed\n");
                jornada_ssp_end();
                return -ETIMEDOUT;
        } else {
@@ -56,7 +54,7 @@ static int jornada_lcd_get_contrast(struct lcd_device *dev)
        }
 }
 
-static int jornada_lcd_set_contrast(struct lcd_device *dev, int value)
+static int jornada_lcd_set_contrast(struct lcd_device *ld, int value)
 {
        int ret;
 
@@ -67,7 +65,7 @@ static int jornada_lcd_set_contrast(struct lcd_device *dev, int value)
 
        /* push the new value */
        if (jornada_ssp_byte(value) != TXDUMMY) {
-               pr_err("set contrast failed\n");
+               dev_err(&ld->dev, "set contrast failed\n");
                jornada_ssp_end();
                return -ETIMEDOUT;
        }
@@ -78,13 +76,14 @@ static int jornada_lcd_set_contrast(struct lcd_device *dev, int value)
        return 0;
 }
 
-static int jornada_lcd_set_power(struct lcd_device *dev, int power)
+static int jornada_lcd_set_power(struct lcd_device *ld, int power)
 {
        if (power != FB_BLANK_UNBLANK) {
                PPSR &= ~PPC_LDD2;
                PPDR |= PPC_LDD2;
-       } else
+       } else {
                PPSR |= PPC_LDD2;
+       }
 
        return 0;
 }
@@ -105,7 +104,7 @@ static int jornada_lcd_probe(struct platform_device *pdev)
 
        if (IS_ERR(lcd_device)) {
                ret = PTR_ERR(lcd_device);
-               pr_err("failed to register device\n");
+               dev_err(&pdev->dev, "failed to register device\n");
                return ret;
        }