Commit 2428e59b authored by Marcin Slusarz's avatar Marcin Slusarz Committed by Linus Torvalds

fbcon: fix sparse warning about shadowing 'rotate' symbol

Signed-off-by: default avatarMarcin Slusarz <marcin.slusarz@gmail.com>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2c6cc35c
...@@ -147,7 +147,7 @@ static char fontname[40]; ...@@ -147,7 +147,7 @@ static char fontname[40];
static int info_idx = -1; static int info_idx = -1;
/* console rotation */ /* console rotation */
static int rotate; static int initial_rotation;
static int fbcon_has_sysfs; static int fbcon_has_sysfs;
static const struct consw fb_con; static const struct consw fb_con;
...@@ -537,9 +537,9 @@ static int __init fb_console_setup(char *this_opt) ...@@ -537,9 +537,9 @@ static int __init fb_console_setup(char *this_opt)
if (!strncmp(options, "rotate:", 7)) { if (!strncmp(options, "rotate:", 7)) {
options += 7; options += 7;
if (*options) if (*options)
rotate = simple_strtoul(options, &options, 0); initial_rotation = simple_strtoul(options, &options, 0);
if (rotate > 3) if (initial_rotation > 3)
rotate = 0; initial_rotation = 0;
} }
} }
return 1; return 1;
...@@ -989,7 +989,7 @@ static const char *fbcon_startup(void) ...@@ -989,7 +989,7 @@ static const char *fbcon_startup(void)
ops->graphics = 1; ops->graphics = 1;
ops->cur_rotate = -1; ops->cur_rotate = -1;
info->fbcon_par = ops; info->fbcon_par = ops;
p->con_rotate = rotate; p->con_rotate = initial_rotation;
set_blitting_type(vc, info); set_blitting_type(vc, info);
if (info->fix.type != FB_TYPE_TEXT) { if (info->fix.type != FB_TYPE_TEXT) {
...@@ -1176,7 +1176,7 @@ static void fbcon_init(struct vc_data *vc, int init) ...@@ -1176,7 +1176,7 @@ static void fbcon_init(struct vc_data *vc, int init)
con_copy_unimap(vc, svc); con_copy_unimap(vc, svc);
ops = info->fbcon_par; ops = info->fbcon_par;
p->con_rotate = rotate; p->con_rotate = initial_rotation;
set_blitting_type(vc, info); set_blitting_type(vc, info);
cols = vc->vc_cols; cols = vc->vc_cols;
......
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