Commit 9aefbaeb authored by Jiri Slaby (SUSE)'s avatar Jiri Slaby (SUSE) Committed by Greg Kroah-Hartman
Browse files

fbdev/core: simplify cursor_state setting in fbcon_ops::cursor() 



There is a switch decicing if cursor should be drawn or not. The whole
switch can be simplified to one line. Do this cleanup as a preparatory
work for the next patch. There, all the CM_* constants are removed.

Signed-off-by: default avatar"Jiri Slaby (SUSE)" <jirislaby@kernel.org>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Helge Deller <deller@gmx.de>
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Tested-by: Helge Deller <deller@gmx.de> # parisc STI console
Link: https://lore.kernel.org/r/20240122110401.7289-29-jirislaby@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c5337c9

drivers/video/fbdev/core/bitblit.c

+1 −10
Original line number Diff line number Diff line
@@ -348,16 +348,7 @@ static void bit_cursor(struct vc_data *vc, struct fb_info *info, int mode, 
			mask[i++] = msk;

	}



	switch (mode) {

	case CM_ERASE:

		ops->cursor_state.enable = 0;

		break;

	case CM_DRAW:

	case CM_MOVE:

	default:

		ops->cursor_state.enable = (use_sw) ? 0 : 1;

		break;

	}

	ops->cursor_state.enable = (mode != CM_ERASE) && !use_sw;



	cursor.image.data = src;

	cursor.image.fg_color = ops->cursor_state.image.fg_color;

drivers/video/fbdev/core/fbcon_ccw.c

+1 −10
Original line number Diff line number Diff line
@@ -349,16 +349,7 @@ static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode, 
		kfree(tmp);

	}



	switch (mode) {

	case CM_ERASE:

		ops->cursor_state.enable = 0;

		break;

	case CM_DRAW:

	case CM_MOVE:

	default:

		ops->cursor_state.enable = (use_sw) ? 0 : 1;

		break;

	}

	ops->cursor_state.enable = (mode != CM_ERASE) && !use_sw;



	cursor.image.data = src;

	cursor.image.fg_color = ops->cursor_state.image.fg_color;

drivers/video/fbdev/core/fbcon_cw.c

+1 −10
Original line number Diff line number Diff line
@@ -332,16 +332,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode, 
		kfree(tmp);

	}



	switch (mode) {

	case CM_ERASE:

		ops->cursor_state.enable = 0;

		break;

	case CM_DRAW:

	case CM_MOVE:

	default:

		ops->cursor_state.enable = (use_sw) ? 0 : 1;

		break;

	}

	ops->cursor_state.enable = (mode != CM_ERASE) && !use_sw;



	cursor.image.data = src;

	cursor.image.fg_color = ops->cursor_state.image.fg_color;

drivers/video/fbdev/core/fbcon_ud.c

+1 −10
Original line number Diff line number Diff line
@@ -372,16 +372,7 @@ static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode, 
			mask[i++] = ~msk;

	}



	switch (mode) {

	case CM_ERASE:

		ops->cursor_state.enable = 0;

		break;

	case CM_DRAW:

	case CM_MOVE:

	default:

		ops->cursor_state.enable = (use_sw) ? 0 : 1;

		break;

	}

	ops->cursor_state.enable = (mode != CM_ERASE) && !use_sw;



	cursor.image.data = src;

	cursor.image.fg_color = ops->cursor_state.image.fg_color;