[U-Boot] [PATCH 3/3 v2] cfb_console.c: checkpatch cleanup
Wolfgang Denk
wd at denx.de
Sun Jul 31 00:48:09 CEST 2011
Fix the following:
ERROR: do not initialise statics to 0 or NULL
ERROR: do not use assignment in if condition
Signed-off-by: Wolfgang Denk <wd at denx.de>
---
Changes:
v2: Fix compile error / incomplete edit
drivers/video/cfb_console.c | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/drivers/video/cfb_console.c b/drivers/video/cfb_console.c
index d2dd421..6e9143e 100644
--- a/drivers/video/cfb_console.c
+++ b/drivers/video/cfb_console.c
@@ -366,8 +366,8 @@ static void *video_console_address; /* console buffer start address */
static int video_logo_height = VIDEO_LOGO_HEIGHT;
-static int console_col = 0; /* cursor col */
-static int console_row = 0; /* cursor row */
+static int console_col; /* cursor col */
+static int console_row; /* cursor row */
static u32 eorx, fgx, bgx; /* color pats */
@@ -1559,18 +1559,21 @@ static void *video_logo(void)
char *s;
ulong addr;
- if ((s = getenv("splashimage")) != NULL) {
+ s = getenv("splashimage");
+ if (s != NULL) {
int x = 0, y = 0;
addr = simple_strtoul(s, NULL, 16);
#ifdef CONFIG_SPLASH_SCREEN_ALIGN
- if ((s = getenv("splashpos")) != NULL) {
+ s = getenv("splashpos");
+ if ((s != NULL) {
if (s[0] == 'm')
x = BMP_ALIGN_CENTER;
else
x = simple_strtol(s, NULL, 0);
- if ((s = strchr(s + 1, ',')) != NULL) {
+ s = strchr(s + 1, ',');
+ if (s != NULL) {
if (s[1] == 'm')
y = BMP_ALIGN_CENTER;
else
@@ -1648,7 +1651,8 @@ static int video_init(void)
{
unsigned char color8;
- if ((pGD = video_hw_init()) == NULL)
+ pGD = video_hw_init();
+ if (pGD == NULL)
return -1;
video_fb_address = (void *) VIDEO_FB_ADRS;
--
1.7.6
More information about the U-Boot
mailing list