staging: sm750fb: rearrange code
authorSudip Mukherjee <sudipm.mukherjee@gmail.com>
Fri, 7 Aug 2015 12:04:05 +0000 (17:34 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 7 Aug 2015 22:12:54 +0000 (15:12 -0700)
Rearrange the code to remove one exit label which also makes the code
less indented and more readable.

Signed-off-by: Sudip Mukherjee <sudip@vectorindia.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/sm750fb/sm750.c

index fa2183d..e7fad0f 100644 (file)
@@ -261,22 +261,21 @@ static void lynxfb_ops_imageblit(struct fb_info *info,
        pitch = info->fix.line_length;
        Bpp = info->var.bits_per_pixel >> 3;
 
-       if (image->depth == 1) {
-               if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
-                   info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
-                       fgcol = ((u32 *)info->pseudo_palette)[image->fg_color];
-                       bgcol = ((u32 *)info->pseudo_palette)[image->bg_color];
-               } else {
-                       fgcol = image->fg_color;
-                       bgcol = image->bg_color;
-               }
-               goto _do_work;
-       }
        /* TODO: Implement hardware acceleration for image->depth > 1 */
-       cfb_imageblit(info, image);
-       return;
+       if (image->depth != 1) {
+               cfb_imageblit(info, image);
+               return;
+       }
+
+       if (info->fix.visual == FB_VISUAL_TRUECOLOR ||
+           info->fix.visual == FB_VISUAL_DIRECTCOLOR) {
+               fgcol = ((u32 *)info->pseudo_palette)[image->fg_color];
+               bgcol = ((u32 *)info->pseudo_palette)[image->bg_color];
+       } else {
+               fgcol = image->fg_color;
+               bgcol = image->bg_color;
+       }
 
-_do_work:
        /*
         * If not use spin_lock, system will die if user load driver
         * and immediately unload driver frequently (dual)