| From b3fe3fe821e8d4f94f023b778fdbff7e6a3b5e14 Mon Sep 17 00:00:00 2001 |
| From: Nathan Chancellor <natechancellor@gmail.com> |
| Date: Tue, 17 Dec 2019 20:00:25 -0700 |
| Subject: [PATCH] fbmem: Adjust indentation in fb_prepare_logo and fb_blank |
| |
| commit 93166f5f2e4dc593cff8ca77ef828ac6f148b0f3 upstream. |
| |
| Clang warns: |
| |
| ../drivers/video/fbdev/core/fbmem.c:665:3: warning: misleading |
| indentation; statement is not part of the previous 'else' |
| [-Wmisleading-indentation] |
| if (fb_logo.depth > 4 && depth > 4) { |
| ^ |
| ../drivers/video/fbdev/core/fbmem.c:661:2: note: previous statement is |
| here |
| else |
| ^ |
| ../drivers/video/fbdev/core/fbmem.c:1075:3: warning: misleading |
| indentation; statement is not part of the previous 'if' |
| [-Wmisleading-indentation] |
| return ret; |
| ^ |
| ../drivers/video/fbdev/core/fbmem.c:1072:2: note: previous statement is |
| here |
| if (!ret) |
| ^ |
| 2 warnings generated. |
| |
| This warning occurs because there are spaces before the tabs on these |
| lines. Normalize the indentation in these functions so that it is |
| consistent with the Linux kernel coding style and clang no longer warns. |
| |
| Fixes: 1692b37c99d5 ("fbdev: Fix logo if logo depth is less than framebuffer depth") |
| Link: https://github.com/ClangBuiltLinux/linux/issues/825 |
| Signed-off-by: Nathan Chancellor <natechancellor@gmail.com> |
| Reviewed-by: Nick Desaulniers <ndesaulniers@google.com> |
| Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> |
| Link: https://patchwork.freedesktop.org/patch/msgid/20191218030025.10064-1-natechancellor@gmail.com |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c |
| index 43a55a22c33d..aecc5f696f9b 100644 |
| --- a/drivers/video/fbdev/core/fbmem.c |
| +++ b/drivers/video/fbdev/core/fbmem.c |
| @@ -673,20 +673,20 @@ int fb_prepare_logo(struct fb_info *info, int rotate) |
| fb_logo.depth = 1; |
| |
| |
| - if (fb_logo.depth > 4 && depth > 4) { |
| - switch (info->fix.visual) { |
| - case FB_VISUAL_TRUECOLOR: |
| - fb_logo.needs_truepalette = 1; |
| - break; |
| - case FB_VISUAL_DIRECTCOLOR: |
| - fb_logo.needs_directpalette = 1; |
| - fb_logo.needs_cmapreset = 1; |
| - break; |
| - case FB_VISUAL_PSEUDOCOLOR: |
| - fb_logo.needs_cmapreset = 1; |
| - break; |
| - } |
| - } |
| + if (fb_logo.depth > 4 && depth > 4) { |
| + switch (info->fix.visual) { |
| + case FB_VISUAL_TRUECOLOR: |
| + fb_logo.needs_truepalette = 1; |
| + break; |
| + case FB_VISUAL_DIRECTCOLOR: |
| + fb_logo.needs_directpalette = 1; |
| + fb_logo.needs_cmapreset = 1; |
| + break; |
| + case FB_VISUAL_PSEUDOCOLOR: |
| + fb_logo.needs_cmapreset = 1; |
| + break; |
| + } |
| + } |
| |
| height = fb_logo.logo->height; |
| if (fb_center_logo) |
| @@ -1080,8 +1080,8 @@ fb_blank(struct fb_info *info, int blank) |
| struct fb_event event; |
| int ret = -EINVAL, early_ret; |
| |
| - if (blank > FB_BLANK_POWERDOWN) |
| - blank = FB_BLANK_POWERDOWN; |
| + if (blank > FB_BLANK_POWERDOWN) |
| + blank = FB_BLANK_POWERDOWN; |
| |
| event.info = info; |
| event.data = ␣ |
| @@ -1089,7 +1089,7 @@ fb_blank(struct fb_info *info, int blank) |
| early_ret = fb_notifier_call_chain(FB_EARLY_EVENT_BLANK, &event); |
| |
| if (info->fbops->fb_blank) |
| - ret = info->fbops->fb_blank(blank, info); |
| + ret = info->fbops->fb_blank(blank, info); |
| |
| if (!ret) |
| fb_notifier_call_chain(FB_EVENT_BLANK, &event); |
| @@ -1102,7 +1102,7 @@ fb_blank(struct fb_info *info, int blank) |
| fb_notifier_call_chain(FB_R_EARLY_EVENT_BLANK, &event); |
| } |
| |
| - return ret; |
| + return ret; |
| } |
| EXPORT_SYMBOL(fb_blank); |
| |
| -- |
| 2.7.4 |
| |