2000-12-10 21:42:21

by Pavel Rabel

Subject: [PATCH] mdacon.c cleanup

Both MODULE_PARM and __init are removed by precompiler when not compiler
as module, so no need for ifdefs.
2.4.0-test12pre8

Pavel Rabel

--- mdacon.c.old Sun Dec 10 21:00:20 2000
+++ mdacon.c Sun Dec 10 21:04:32 2000
@@ -77,10 +77,8 @@

static struct vc_data *mda_display_fg = NULL;

-#ifdef MODULE_PARM
MODULE_PARM(mda_first_vc, "1-255i");
MODULE_PARM(mda_last_vc, "1-255i");
-#endif

/* MDA register values
*/
@@ -200,11 +198,7 @@
}
#endif

-#ifdef MODULE
-static int mda_detect(void)
-#else
static int __init mda_detect(void)
-#endif
{
int count=0;
u16 *p, p_save;
@@ -287,11 +281,7 @@
return 1;
}

-#ifdef MODULE
-static void mda_initialize(void)
-#else
static void __init mda_initialize(void)
-#endif
{
write_mda_b(97, 0x00); /* horizontal total */
write_mda_b(80, 0x01); /* horizontal displayed */
@@ -316,11 +306,7 @@
outb_p(0x00, mda_gfx_port);
}

-#ifdef MODULE
-static const char *mdacon_startup(void)
-#else
static const char __init *mdacon_startup(void)
-#endif
{
mda_num_columns = 80;
mda_num_lines = 25;
@@ -605,11 +591,7 @@
con_invert_region: mdacon_invert_region,
};

-#ifdef MODULE
-void mda_console_init(void)
-#else
void __init mda_console_init(void)
-#endif
{
if (mda_first_vc > mda_last_vc)
return;

2000-12-12 21:01:07

by David Woodhouse

Subject: Re: [PATCH] mdacon.c cleanup

[email protected] said:
> Both MODULE_PARM and __init are removed by precompiler when not
> compiler as module, so no need for ifdefs. 2.4.0-test12pre8

-#ifdef MODULE_PARM
MODULE_PARM(mda_first_vc, "1-255i");
MODULE_PARM(mda_last_vc, "1-255i");
-#endif

That was #ifdef MODULE_PARM not #ifdef MODULE. Probably there for
compatibility with older kernels. Although I'm not sure it's even required
in 2.2.

And you seem to have forgotten to Cc the maintainer.

--
dwmw2

2000-12-12 23:08:07

by Pavel Rabel

Subject: Re: [PATCH] mdacon.c cleanup

On Tue, 12 Dec 2000, David Woodhouse wrote:

> [email protected] said:
> > Both MODULE_PARM and __init are removed by precompiler when not
> > compiler as module, so no need for ifdefs. 2.4.0-test12pre8
>
> -#ifdef MODULE_PARM
> MODULE_PARM(mda_first_vc, "1-255i");
> MODULE_PARM(mda_last_vc, "1-255i");
> -#endif
>
> That was #ifdef MODULE_PARM not #ifdef MODULE. Probably there for
> compatibility with older kernels. Although I'm not sure it's even required
> in 2.2.

MODULE_PARM is removed by precompiler, in both 2.2 and 2.4. For sure.

Pavel