Commit 58d2ef9c authored by Thomas Zimmermann's avatar Thomas Zimmermann

fbdev/core: Fix style of code for boot-up logo

Fix a number of warnings from checkpatch.pl in this code before
moving it into a separate file. This includes

 * Prefer 'unsigned int' to bare use of 'unsigned'
 * space required after that ',' (ctx:VxV)
 * space prohibited after that open parenthesis '('
 * suspect code indent for conditional statements (16, 32)
 * braces {} are not necessary for single statement blocks

No functional changes.
Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Acked-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230907085408.9354-4-tzimmermann@suse.de
parent 828d9663
...@@ -186,7 +186,7 @@ EXPORT_SYMBOL(fb_get_buffer_offset); ...@@ -186,7 +186,7 @@ EXPORT_SYMBOL(fb_get_buffer_offset);
#ifdef CONFIG_LOGO #ifdef CONFIG_LOGO
static inline unsigned safe_shift(unsigned d, int n) static inline unsigned int safe_shift(unsigned int d, int n)
{ {
return n < 0 ? d >> -n : d << n; return n < 0 ? d >> -n : d << n;
} }
...@@ -229,7 +229,9 @@ static void fb_set_logo_truepalette(struct fb_info *info, ...@@ -229,7 +229,9 @@ static void fb_set_logo_truepalette(struct fb_info *info,
const struct linux_logo *logo, const struct linux_logo *logo,
u32 *palette) u32 *palette)
{ {
static const unsigned char mask[] = { 0,0x80,0xc0,0xe0,0xf0,0xf8,0xfc,0xfe,0xff }; static const unsigned char mask[] = {
0, 0x80, 0xc0, 0xe0, 0xf0, 0xf8, 0xfc, 0xfe, 0xff
};
unsigned char redmask, greenmask, bluemask; unsigned char redmask, greenmask, bluemask;
int redshift, greenshift, blueshift; int redshift, greenshift, blueshift;
int i; int i;
...@@ -247,7 +249,7 @@ static void fb_set_logo_truepalette(struct fb_info *info, ...@@ -247,7 +249,7 @@ static void fb_set_logo_truepalette(struct fb_info *info,
greenshift = info->var.green.offset - (8 - info->var.green.length); greenshift = info->var.green.offset - (8 - info->var.green.length);
blueshift = info->var.blue.offset - (8 - info->var.blue.length); blueshift = info->var.blue.offset - (8 - info->var.blue.length);
for ( i = 0; i < logo->clutsize; i++) { for (i = 0; i < logo->clutsize; i++) {
palette[i+32] = (safe_shift((clut[0] & redmask), redshift) | palette[i+32] = (safe_shift((clut[0] & redmask), redshift) |
safe_shift((clut[1] & greenmask), greenshift) | safe_shift((clut[1] & greenmask), greenshift) |
safe_shift((clut[2] & bluemask), blueshift)); safe_shift((clut[2] & bluemask), blueshift));
...@@ -371,7 +373,7 @@ static void fb_rotate_logo_cw(const u8 *in, u8 *out, u32 width, u32 height) ...@@ -371,7 +373,7 @@ static void fb_rotate_logo_cw(const u8 *in, u8 *out, u32 width, u32 height)
for (i = 0; i < height; i++) for (i = 0; i < height; i++)
for (j = 0; j < width; j++) for (j = 0; j < width; j++)
out[height * j + h - i] = *in++; out[height * j + h - i] = *in++;
} }
static void fb_rotate_logo_ccw(const u8 *in, u8 *out, u32 width, u32 height) static void fb_rotate_logo_ccw(const u8 *in, u8 *out, u32 width, u32 height)
...@@ -636,9 +638,8 @@ int fb_prepare_logo(struct fb_info *info, int rotate) ...@@ -636,9 +638,8 @@ int fb_prepare_logo(struct fb_info *info, int rotate)
/* Return if no suitable logo was found */ /* Return if no suitable logo was found */
fb_logo.logo = fb_find_logo(depth); fb_logo.logo = fb_find_logo(depth);
if (!fb_logo.logo) { if (!fb_logo.logo)
return 0; return 0;
}
if (rotate == FB_ROTATE_UR || rotate == FB_ROTATE_UD) if (rotate == FB_ROTATE_UR || rotate == FB_ROTATE_UD)
yres = info->var.yres; yres = info->var.yres;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment