backlight: backlight: Refactor fb_notifier_callback()

Increase readability of fb_notifier_callback() by removing
a few indent levels.

No functional change.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/video/backlight/backlight.c b/drivers/video/backlight/backlight.c
index 744ba58488e01368e287b3288f19356a207c7eb7..18501956dd8790917b01d582c38701e362753f67 100644 (file)
--- a/drivers/video/backlight/backlight.c
+++ b/drivers/video/backlight/backlight.c
@@ -58,28 +58,29 @@ static int fb_notifier_callback(struct notifier_block *self,
 
        bd = container_of(self, struct backlight_device, fb_notif);
        mutex_lock(&bd->ops_lock);
-       if (bd->ops)
-               if (!bd->ops->check_fb ||
-                   bd->ops->check_fb(bd, evdata->info)) {
-                       fb_blank = *(int *)evdata->data;
-                       if (fb_blank == FB_BLANK_UNBLANK &&
-                           !bd->fb_bl_on[node]) {
-                               bd->fb_bl_on[node] = true;
-                               if (!bd->use_count++) {
-                                       bd->props.state &= ~BL_CORE_FBBLANK;
-                                       bd->props.fb_blank = FB_BLANK_UNBLANK;
-                                       backlight_update_status(bd);
-                               }
-                       } else if (fb_blank != FB_BLANK_UNBLANK &&
-                                  bd->fb_bl_on[node]) {
-                               bd->fb_bl_on[node] = false;
-                               if (!(--bd->use_count)) {
-                                       bd->props.state |= BL_CORE_FBBLANK;
-                                       bd->props.fb_blank = fb_blank;
-                                       backlight_update_status(bd);
-                               }
-                       }
+
+       if (!bd->ops)
+               goto out;
+       if (bd->ops->check_fb && !bd->ops->check_fb(bd, evdata->info))
+               goto out;
+
+       fb_blank = *(int *)evdata->data;
+       if (fb_blank == FB_BLANK_UNBLANK && !bd->fb_bl_on[node]) {
+               bd->fb_bl_on[node] = true;
+               if (!bd->use_count++) {
+                       bd->props.state &= ~BL_CORE_FBBLANK;
+                       bd->props.fb_blank = FB_BLANK_UNBLANK;
+                       backlight_update_status(bd);
+               }
+       } else if (fb_blank != FB_BLANK_UNBLANK && bd->fb_bl_on[node]) {
+               bd->fb_bl_on[node] = false;
+               if (!(--bd->use_count)) {
+                       bd->props.state |= BL_CORE_FBBLANK;
+                       bd->props.fb_blank = fb_blank;
+                       backlight_update_status(bd);
                }
+       }
+out:
        mutex_unlock(&bd->ops_lock);
        return 0;
 }