linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Marcin Ślusarz" <marcin.slusarz@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: Antonino Daplas <adaplas@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] fbcon: fix sparse warning about shadowing 'rotate' symbol
Date: Sun, 9 Dec 2007 22:36:54 +0100	[thread overview]
Message-ID: <20071209213650.GF9440@joi> (raw)

fbcon: fix sparse warning about shadowing 'rotate' symbol

Signed-off-by: Marcin Ślusarz <marcin.slusarz@gmail.com>
---
 drivers/video/console/fbcon.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
index 849e114..445839c 100644
--- a/drivers/video/console/fbcon.c
+++ b/drivers/video/console/fbcon.c
@@ -147,7 +147,7 @@ static char fontname[40];
 static int info_idx = -1;

 /* console rotation */
-static int rotate;
+static int initial_rotation;
 static int fbcon_has_sysfs;

 static const struct consw fb_con;
@@ -537,9 +537,9 @@ static int __init fb_console_setup(char *this_opt)
 		if (!strncmp(options, "rotate:", 7)) {
 			options += 7;
 			if (*options)
-				rotate = simple_strtoul(options, &options, 0);
-			if (rotate > 3)
-				rotate = 0;
+				initial_rotation = simple_strtoul(options, &options, 0);
+			if (initial_rotation > 3)
+				initial_rotation = 0;
 		}
 	}
 	return 1;
@@ -989,7 +989,7 @@ static const char *fbcon_startup(void)
 	ops->graphics = 1;
 	ops->cur_rotate = -1;
 	info->fbcon_par = ops;
-	p->con_rotate = rotate;
+	p->con_rotate = initial_rotation;
 	set_blitting_type(vc, info);

 	if (info->fix.type != FB_TYPE_TEXT) {
@@ -1176,7 +1176,7 @@ static void fbcon_init(struct vc_data *vc, int init)
 		con_copy_unimap(vc, svc);

 	ops = info->fbcon_par;
-	p->con_rotate = rotate;
+	p->con_rotate = initial_rotation;
 	set_blitting_type(vc, info);

 	cols = vc->vc_cols;

                 reply	other threads:[~2007-12-09 21:35 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20071209213650.GF9440@joi \
    --to=marcin.slusarz@gmail.com \
    --cc=adaplas@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).