backlight: jornada720: use pr_err()/pr_info() instead of printk()

[~shefty/rdma-dev.git] / drivers / video / backlight / jornada720_bl.c

diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
index 2f8af5d786abbb5971aed6cad8c153229a4b4b84..16f593b64427a606093f1c14dce6498ab791a5cb 100644 (file)
--- a/drivers/video/backlight/jornada720_bl.c
+++ b/drivers/video/backlight/jornada720_bl.c
@@ -9,6 +9,8 @@
  *
  */
 
  *
  */
 

+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+

 #include <linux/backlight.h>
 #include <linux/device.h>
 #include <linux/fb.h>
 #include <linux/backlight.h>
 #include <linux/device.h>
 #include <linux/fb.h>


@@ -38,7 +40,7 @@ static int jornada_bl_get_brightness(struct backlight_device *bd)
        ret = jornada_ssp_byte(GETBRIGHTNESS);
 
        if (jornada_ssp_byte(GETBRIGHTNESS) != TXDUMMY) {
        ret = jornada_ssp_byte(GETBRIGHTNESS);
 
        if (jornada_ssp_byte(GETBRIGHTNESS) != TXDUMMY) {

-               printk(KERN_ERR "bl : get brightness timeout\n");
+               pr_err("get brightness timeout\n");

                jornada_ssp_end();
                return -ETIMEDOUT;
        } else /* exchange txdummy for value */
                jornada_ssp_end();
                return -ETIMEDOUT;
        } else /* exchange txdummy for value */


@@ -59,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) {
        if ((bd->props.power != FB_BLANK_UNBLANK) || (bd->props.fb_blank != FB_BLANK_UNBLANK)) {
                ret = jornada_ssp_byte(BRIGHTNESSOFF);
                if (ret != TXDUMMY) {

-                       printk(KERN_INFO "bl : brightness off timeout\n");
+                       pr_info("brightness off timeout\n");

                        /* turn off backlight */
                        PPSR &= ~PPC_LDD1;
                        PPDR |= PPC_LDD1;
                        /* turn off backlight */
                        PPSR &= ~PPC_LDD1;
                        PPDR |= PPC_LDD1;


@@ -70,7 +72,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
 
                /* send command to our mcu */
                if (jornada_ssp_byte(SETBRIGHTNESS) != TXDUMMY) {
 
                /* send command to our mcu */
                if (jornada_ssp_byte(SETBRIGHTNESS) != TXDUMMY) {

-                       printk(KERN_INFO "bl : failed to set brightness\n");
+                       pr_info("failed to set brightness\n");

                        ret = -ETIMEDOUT;
                        goto out;
                }
                        ret = -ETIMEDOUT;
                        goto out;
                }


@@ -81,7 +83,7 @@ static int jornada_bl_update_status(struct backlight_device *bd)
                   but due to physical layout it is equal to 0, so we simply
                   invert the value (MAX VALUE - NEW VALUE). */
                if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness) != TXDUMMY) {
                   but due to physical layout it is equal to 0, so we simply
                   invert the value (MAX VALUE - NEW VALUE). */
                if (jornada_ssp_byte(BL_MAX_BRIGHT - bd->props.brightness) != TXDUMMY) {

-                       printk(KERN_ERR "bl : set brightness failed\n");
+                       pr_err("set brightness failed\n");

                        ret = -ETIMEDOUT;
                }
 
                        ret = -ETIMEDOUT;
                }
 


@@ -113,7 +115,7 @@ static int jornada_bl_probe(struct platform_device *pdev)
 
        if (IS_ERR(bd)) {
                ret = PTR_ERR(bd);
 
        if (IS_ERR(bd)) {
                ret = PTR_ERR(bd);

-               printk(KERN_ERR "bl : failed to register device, err=%x\n", ret);
+               pr_err("failed to register device, err=%x\n", ret);

                return ret;
        }
 
                return ret;
        }
 


@@ -125,7 +127,7 @@ static int jornada_bl_probe(struct platform_device *pdev)
        jornada_bl_update_status(bd);
 
        platform_set_drvdata(pdev, bd);
        jornada_bl_update_status(bd);
 
        platform_set_drvdata(pdev, bd);

-       printk(KERN_INFO "HP Jornada 700 series backlight driver\n");
+       pr_info("HP Jornada 700 series backlight driver\n");

 
        return 0;
 }
 
        return 0;
 }