[Linux-fbdev-devel] [PATCH 1/4] vt: Replace mask 0x0f with macro CUR_HWMASK

[Henry N. <hen...@gm...>]

from: Henry Nestler <hen...@gm...>

Replace hard coded 0x0f with pre-defined macro CUR_HWMASK
to mask vc_cursor_type, and replace hard coded 1 with CUR_NONE.

Signed-off-by: Henry Nestler <hen...@gm...>
---
Kernel version 2.6.32-rc8

 drivers/char/vt.c                       |    2 +-
 drivers/usb/misc/sisusbvga/sisusb_con.c |    2 +-
 drivers/video/console/mdacon.c          |    2 +-
 drivers/video/console/sticon.c          |    2 +-
 drivers/video/console/tileblit.c        |    2 +-
 drivers/video/console/vgacon.c          |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/char/vt.c b/drivers/char/vt.c
index 0c80c68..26cf397 100644
--- a/drivers/char/vt.c
+++ b/drivers/char/vt.c
@@ -606,7 +606,7 @@ static void set_cursor(struct vc_data *vc)
 		if (vc == sel_cons)
 			clear_selection();
 		add_softcursor(vc);
-		if ((vc->vc_cursor_type & 0x0f) != 1)
+		if ((vc->vc_cursor_type & CUR_HWMASK) != CUR_NONE)
 			vc->vc_sw->con_cursor(vc, CM_DRAW);
 	} else
 		hide_cursor(vc);
diff --git a/drivers/usb/misc/sisusbvga/sisusb_con.c
b/drivers/usb/misc/sisusbvga/sisusb_con.c
index b624320..7599765 100644
--- a/drivers/usb/misc/sisusbvga/sisusb_con.c
+++ b/drivers/usb/misc/sisusbvga/sisusb_con.c
@@ -806,7 +806,7 @@ sisusbcon_cursor(struct vc_data *c, int mode)

 	baseline = c->vc_font.height - (c->vc_font.height < 10 ? 1 : 2);

-	switch (c->vc_cursor_type & 0x0f) {
+	switch (c->vc_cursor_type & CUR_HWMASK) {
 		case CUR_BLOCK:		from = 1;
 					to   = c->vc_font.height;
 					break;
diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c
index dd3eaaa..688837d 100644
--- a/drivers/video/console/mdacon.c
+++ b/drivers/video/console/mdacon.c
@@ -520,7 +520,7 @@ static void mdacon_cursor(struct vc_data *c, int mode)

 	mda_set_cursor(c->vc_y*mda_num_columns*2 + c->vc_x*2);

-	switch (c->vc_cursor_type & 0x0f) {
+	switch (c->vc_cursor_type & CUR_HWMASK) {

 		case CUR_LOWER_THIRD:	mda_set_cursor_size(10, 13); break;
 		case CUR_LOWER_HALF:	mda_set_cursor_size(7,  13); break;
diff --git a/drivers/video/console/sticon.c b/drivers/video/console/sticon.c
index 491c1c1..b7c3262 100644
--- a/drivers/video/console/sticon.c
+++ b/drivers/video/console/sticon.c
@@ -144,7 +144,7 @@ static void sticon_cursor(struct vc_data *conp, int mode)
 	break;
     case CM_MOVE:
     case CM_DRAW:
-	switch (conp->vc_cursor_type & 0x0f) {
+	switch (conp->vc_cursor_type & CUR_HWMASK) {
 	case CUR_UNDERLINE:
 	case CUR_LOWER_THIRD:
 	case CUR_LOWER_HALF:
diff --git a/drivers/video/console/tileblit.c b/drivers/video/console/tileblit.c
index 0056a41..33bb70d 100644
--- a/drivers/video/console/tileblit.c
+++ b/drivers/video/console/tileblit.c
@@ -91,7 +91,7 @@ static void tile_cursor(struct vc_data *vc, struct
fb_info *info, int mode,
 	cursor.fg = fg;
 	cursor.bg = bg;

-	switch (vc->vc_cursor_type & 0x0f) {
+	switch (vc->vc_cursor_type & CUR_HWMASK) {
 	case CUR_NONE:
 		cursor.shape = FB_TILE_CURSOR_NONE;
 		break;
diff --git a/drivers/video/console/vgacon.c b/drivers/video/console/vgacon.c
index da55cca..40bd8f8 100644
--- a/drivers/video/console/vgacon.c
+++ b/drivers/video/console/vgacon.c
@@ -703,7 +703,7 @@ static void vgacon_cursor(struct vc_data *c, int mode)
 	case CM_MOVE:
 	case CM_DRAW:
 		write_vga(14, (c->vc_pos - vga_vram_base) / 2);
-		switch (c->vc_cursor_type & 0x0f) {
+		switch (c->vc_cursor_type & CUR_HWMASK) {
 		case CUR_UNDERLINE:
 			vgacon_set_cursor_size(c->vc_x,
 					       c->vc_font.height -
===