backlight: jornada720: fix checkpatch error and warning

This patch fixes the checkpatch error and warning as below:

WARNING: line over 80 characters
ERROR: return is not a function, parentheses are not required

Also, long comments are fixed for the preferred style.

Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

diff --git a/drivers/video/backlight/jornada720_bl.c b/drivers/video/backlight/jornada720_bl.c
index 16f593b64427a606093f1c14dce6498ab791a5cb..c23801cd337f250dff54666afbd334df2c5bc494 100644 (file)
--- a/drivers/video/backlight/jornada720_bl.c
+++ b/drivers/video/backlight/jornada720_bl.c
@@ -48,7 +48,7 @@ static int jornada_bl_get_brightness(struct backlight_device *bd)
 
        jornada_ssp_end();
 
-       return (BL_MAX_BRIGHT - ret);
+       return BL_MAX_BRIGHT - ret;
 }
 
 static int jornada_bl_update_status(struct backlight_device *bd)
@@ -58,7 +58,8 @@ static int jornada_bl_update_status(struct backlight_device *bd)
        jornada_ssp_start();
 
        /* If backlight is off then really turn it off */
-       if ((bd->props.power != FB_BLANK_UNBLANK) || (bd->props.fb_blank != FB_BLANK_UNBLANK)) {
+       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");
@@ -77,18 +78,23 @@ static int jornada_bl_update_status(struct backlight_device *bd)
                        goto out;
                }
 
-               /* at this point we expect that the mcu has accepted
-                  our command and is waiting for our new value
-                  please note that maximum brightness is 255,
-                  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) {
+               /*
+                * at this point we expect that the mcu has accepted
+                * our command and is waiting for our new value
+                * please note that maximum brightness is 255,
+                * 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) {
                        pr_err("set brightness failed\n");
                        ret = -ETIMEDOUT;
                }
 
-               /* If infact we get an TXDUMMY as output we are happy and dont
-                  make any further comments about it */
+               /*
+                * If infact we get an TXDUMMY as output we are happy and dont
+                * make any further comments about it
+                */
 out:
        jornada_ssp_end();
 
@@ -121,9 +127,11 @@ static int jornada_bl_probe(struct platform_device *pdev)
 
        bd->props.power = FB_BLANK_UNBLANK;
        bd->props.brightness = BL_DEF_BRIGHT;
-       /* note. make sure max brightness is set otherwise
-          you will get seemingly non-related errors when
-          trying to change brightness */
+       /*
+        * note. make sure max brightness is set otherwise
+        * you will get seemingly non-related errors when
+        * trying to change brightness
+        */
        jornada_bl_update_status(bd);
 
        platform_set_drvdata(pdev, bd);

diff --git a/drivers/video/backlight/jornada720_lcd.c b/drivers/video/backlight/jornada720_lcd.c
index 635b30523fd598556f674ff31c8d46031475718f..4b412cbe1473bba7d8de152382167b98915df465 100644 (file)
--- a/drivers/video/backlight/jornada720_lcd.c
+++ b/drivers/video/backlight/jornada720_lcd.c
@@ -101,7 +101,8 @@ static int jornada_lcd_probe(struct platform_device *pdev)
        struct lcd_device *lcd_device;
        int ret;
 
-       lcd_device = lcd_device_register(S1D_DEVICENAME, &pdev->dev, NULL, &jornada_lcd_props);
+       lcd_device = lcd_device_register(S1D_DEVICENAME, &pdev->dev, NULL,
+                                       &jornada_lcd_props);
 
        if (IS_ERR(lcd_device)) {
                ret = PTR_ERR(lcd_device);