X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fvideo%2Fconsole%2Fmdacon.c;h=be3d53596f8d326b3c2da1ecaa8d1c665bbc197a;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=6dbeb18946b9c24618941f743021449ee2c6b21a;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c index 6dbeb1894..be3d53596 100644 --- a/drivers/video/console/mdacon.c +++ b/drivers/video/console/mdacon.c @@ -47,7 +47,7 @@ #include #include -static spinlock_t mda_lock = SPIN_LOCK_UNLOCKED; +static DEFINE_SPINLOCK(mda_lock); /* description of the hardware layout */ @@ -64,7 +64,6 @@ static unsigned int mda_gfx_port; /* Graphics control port */ /* current hardware state */ -static int mda_origin_loc=-1; static int mda_cursor_loc=-1; static int mda_cursor_size_from=-1; static int mda_cursor_size_to=-1; @@ -79,8 +78,8 @@ static int mda_last_vc = 16; static struct vc_data *mda_display_fg = NULL; -MODULE_PARM(mda_first_vc, "1-255i"); -MODULE_PARM(mda_last_vc, "1-255i"); +module_param(mda_first_vc, int, 0); +module_param(mda_last_vc, int, 0); /* MDA register values */ @@ -148,16 +147,6 @@ static int test_mda_b(unsigned char val, unsigned char reg) } #endif -static inline void mda_set_origin(unsigned int location) -{ - if (mda_origin_loc == location) - return; - - write_mda_w(location >> 1, 0x0c); - - mda_origin_loc = location; -} - static inline void mda_set_cursor(unsigned int location) { if (mda_cursor_loc == location)