fbmem: Adjust indentation in fb_prepare_logo and fb_blank
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: 1692b37c99
("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
This commit is contained in:
parent
2be2450215
commit
93166f5f2e
|
@ -663,20 +663,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)
|
||||
|
@ -1065,19 +1065,19 @@ fb_blank(struct fb_info *info, int blank)
|
|||
struct fb_event event;
|
||||
int ret = -EINVAL;
|
||||
|
||||
if (blank > FB_BLANK_POWERDOWN)
|
||||
blank = FB_BLANK_POWERDOWN;
|
||||
if (blank > FB_BLANK_POWERDOWN)
|
||||
blank = FB_BLANK_POWERDOWN;
|
||||
|
||||
event.info = info;
|
||||
event.data = ␣
|
||||
|
||||
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);
|
||||
|
||||
return ret;
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL(fb_blank);
|
||||
|
||||
|
|
Loading…
Reference in New Issue