Skip to contentSkip to conversation

fbcon: fix sparse warning about shadowing 'p' symbol

PATCH In review Marcin Ślusarz 4 participants 5 messages Dec 9, 2007 – Dec 12, 2007

Subsystems (2)
Framebuffer layer Console
lore
Share & tools
lore

Marcin Ślusarz

author
#0 lore raw

PATCH 1/1 fbcon: fix sparse warning about shadowing 'p' symbol

fbcon: fix sparse warning about shadowing 'p' symbol

Signed-off-by Marcin Ślusarz <[email protected]>
---
 drivers/video/console/fbcon.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/video/console/fbcon.c +5 -5
index 0f32f4a..849e114 100644
@@ -2795,7 +2795,7 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
 {
 	struct fb_info *info = registered_fb[con2fb_map[fg_console]];
 	struct fbcon_ops *ops = info->fbcon_par;
-	struct display *p = &fb_display[fg_console];
+	struct display *disp = &fb_display[fg_console];
 	int offset, limit, scrollback_old;
 
 	if (softback_top) {

@@ -2833,7 +2833,7 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
 			logo_shown = FBCON_LOGO_CANSHOW;
 		}
 		fbcon_cursor(vc, CM_ERASE | CM_SOFTBACK);
-		fbcon_redraw_softback(vc, p, lines);
+		fbcon_redraw_softback(vc, disp, lines);
 		fbcon_cursor(vc, CM_DRAW | CM_SOFTBACK);
 		return 0;
 	}

@@ -2855,9 +2855,9 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
 
 	fbcon_cursor(vc, CM_ERASE);
 
-	offset = p->yscroll - scrollback_current;
-	limit = p->vrows;
-	switch (p->scrollmode) {
+	offset = disp->yscroll - scrollback_current;
+	limit = disp->vrows;
+	switch (disp->scrollmode) {
 	case SCROLL_WRAP_MOVE:
 		info->var.vmode |= FB_VMODE_YWRAP;
 		break;
#1 lore raw
Quoted 2 lines · On Sun, 9 Dec 2007 22:34:33 +0100 Marcin __lusarz <[email protected]>…

fbcon: fix sparse warning about shadowing 'p' symbol

Please always quote error messages and warnings in the changelog when fixing them, thanks.

Quoted 9 lines
---
 drivers/video/console/fbcon.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
drivers/video/console/fbcon.c +0 -0
index 0f32f4a..849e114 100644

drivers/video/console/fbcon.c static int fbcon_scrolldelta(struct vc_data *vc, int lines) · line 2798

Quoted 5 lines
drivers/video/console/fbcon.c +1 -1
@@ -2795,7 +2795,7 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
 {
 	struct fb_info *info = registered_fb[con2fb_map[fg_console]];
 	struct fbcon_ops *ops = info->fbcon_par;
-	struct display *p = &fb_display[fg_console];
+	struct display *disp = &fb_display[fg_console];

We have a global symbol called "p"? That would be bad. Where is it?

(The patch is good anwyay - "p" is a poorly chosen identifier here).

#2 lore raw
Quoted 10 lines · Andrew Morton

drivers/video/console/fbcon.c static int fbcon_scrolldelta(struct vc_data *vc, int lines) · line 2798

Quoted 8 lines
drivers/video/console/fbcon.c +1 -1
@@ -2795,7 +2795,7 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
 {
 	struct fb_info *info = registered_fb[con2fb_map[fg_console]];
 	struct fbcon_ops *ops = info->fbcon_par;
-	struct display *p = &fb_display[fg_console];
+	struct display *disp = &fb_display[fg_console];

We have a global symbol called "p"? That would be bad. Where is it?

in the same function.
We have quite a few shadow warnings in that file.

drivers/video/console/fbcon.c:337:25: warning: symbol '_x' shadows an earlier one drivers/video/console/fbcon.c:337:25: originally declared here drivers/video/console/fbcon.c:337:25: warning: symbol '_x' shadows an earlier one drivers/video/console/fbcon.c:337:25: originally declared here drivers/video/console/fbcon.c:337:25: warning: symbol '_y' shadows an earlier one drivers/video/console/fbcon.c:337:25: originally declared here drivers/video/console/fbcon.c:2813:19: warning: symbol 'p' shadows an earlier one drivers/video/console/fbcon.c:2798:17: originally declared here drivers/video/console/fbcon.c:3336:6: warning: symbol 'rotate' shadows an earlier one drivers/video/console/fbcon.c:150:12: originally declared here drivers/video/console/fbcon.c:3361:6: warning: symbol 'rotate' shadows an earlier one drivers/video/console/fbcon.c:150:12: originally declared here drivers/video/console/fbcon.c:3385:6: warning: symbol 'rotate' shadows an earlier one drivers/video/console/fbcon.c:150:12: originally declared here

Dave

Signature · 1 line
http://www.codemonkey.org.uk
#4 lore raw
In reply to Andrew Morton

From: Andrew Morton <[email protected]>
Date: Tue, 11 Dec 2007 16:57:00 -0800

Quoted 13 lines
Quoted 2 lines · On Sun, 9 Dec 2007 22:34:33 +0100 Marcin __lusarz <[email protected]>…

fbcon: fix sparse warning about shadowing 'p' symbol

Please always quote error messages and warnings in the changelog when fixing them, thanks.

Quoted 4 lines
---
 drivers/video/console/fbcon.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
Quoted 12 lines

drivers/video/console/fbcon.c static int fbcon_scrolldelta(struct vc_data *vc, int lines) · line 2798

Quoted 10 lines
drivers/video/console/fbcon.c +1 -1
index 0f32f4a..849e114 100644
@@ -2795,7 +2795,7 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
 {
 	struct fb_info *info = registered_fb[con2fb_map[fg_console]];
 	struct fbcon_ops *ops = info->fbcon_par;
-	struct display *p = &fb_display[fg_console];
+	struct display *disp = &fb_display[fg_console];

We have a global symbol called "p"? That would be bad. Where is it?

I'm curious about this too.

Ahh, I see, look down a few lines in fbcon_scrolldelta(), we have:

			if (logo_shown == vc->vc_num) {
				unsigned long p, q;
				int i;

and that's where the warning is coming from.

author
#3 lore raw
In reply to Dave Jones
Quoted 16 lines · Dave Jones
Quoted 10 lines · Andrew Morton

drivers/video/console/fbcon.c static int fbcon_scrolldelta(struct vc_data *vc, int lines) · line 2798

Quoted 8 lines
drivers/video/console/fbcon.c +1 -1
@@ -2795,7 +2795,7 @@ static int fbcon_scrolldelta(struct vc_data *vc, int lines)
 {
 	struct fb_info *info = registered_fb[con2fb_map[fg_console]];
 	struct fbcon_ops *ops = info->fbcon_par;
-	struct display *p = &fb_display[fg_console];
+	struct display *disp = &fb_display[fg_console];

We have a global symbol called "p"? That would be bad. Where is it?

in the same function.
We have quite a few shadow warnings in that file.

Quoted 6 lines

drivers/video/console/fbcon.c:337:25: warning: symbol '_x' shadows an earlier one drivers/video/console/fbcon.c:337:25: originally declared here drivers/video/console/fbcon.c:337:25: warning: symbol '_x' shadows an earlier one drivers/video/console/fbcon.c:337:25: originally declared here drivers/video/console/fbcon.c:337:25: warning: symbol '_y' shadows an earlier one drivers/video/console/fbcon.c:337:25: originally declared here

That's from max(A, max(B, C)) and max is defined as:

#define max(x,y) ({ \
        typeof(x) _x = (x);     \
        typeof(y) _y = (y);     \
        (void) (&_x == &_y);            \
        _x > _y ? _x : _y; })

Don't know how to fix it without making the code look uglier...

Quoted 6 lines

drivers/video/console/fbcon.c:3336:6: warning: symbol 'rotate' shadows an earlier one drivers/video/console/fbcon.c:150:12: originally declared here drivers/video/console/fbcon.c:3361:6: warning: symbol 'rotate' shadows an earlier one drivers/video/console/fbcon.c:150:12: originally declared here drivers/video/console/fbcon.c:3385:6: warning: symbol 'rotate' shadows an earlier one drivers/video/console/fbcon.c:150:12: originally declared here

That's fixed in another patch.

Marcin