Skip to contentSkip to conversation

Remove MODULE_PARM from i386 defconfig.

PATCH In review Rusty Russell 2 participants 4 messages Oct 20, 2004 – Oct 21, 2004

Subsystems (5)
Network drivers ACPI Char and misc drivers ACPI thermal driver +1 more subsystems
lore
Share & tools
lore

Rusty Russell

author
#0 lore raw

PATCH 1/1 Remove MODULE_PARM from i386 defconfig.

This cleans up defconfig for i386. Not much work.

Name: Remove MODULE_PARM from i386 defconfig
Status: Compiled on 2.6-bk
Depends: Module/MODULE_PARM-warning.patch.gz

Signed-off-by Rusty Russell <[email protected]>

This patch removes MODULE_PARM for everything made by "defconfig" on x86. There are only a few left.

drivers/acpi/thermal.c +1 -1
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .22800-linux-2.6-bk/drivers/acpi/thermal.c .22800-linux-2.6-bk.updated/drivers/acpi/thermal.c
@@ -76,7 +76,7 @@ MODULE_DESCRIPTION(ACPI_THERMAL_DRIVER_N
 MODULE_LICENSE("GPL");
 
 static int tzp;
-MODULE_PARM(tzp, "i");
+module_param(tzp, int, 0);
 MODULE_PARM_DESC(tzp, "Thermal zone polling frequency, in 1/10 seconds.\n");
drivers/cdrom/cdrom.c +6 -6
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .22800-linux-2.6-bk/drivers/cdrom/cdrom.c .22800-linux-2.6-bk.updated/drivers/cdrom/cdrom.c
@@ -296,12 +296,12 @@ static int lockdoor = 1;
 static int check_media_type;
 /* automatically restart mrw format */
 static int mrw_format_restart = 1;
-MODULE_PARM(debug, "i");
-MODULE_PARM(autoclose, "i");
-MODULE_PARM(autoeject, "i");
-MODULE_PARM(lockdoor, "i");
-MODULE_PARM(check_media_type, "i");
-MODULE_PARM(mrw_format_restart, "i");
+module_param(debug, bool, 0);
+module_param(autoclose, bool, 0);
+module_param(autoeject, bool, 0);
+module_param(lockdoor, bool, 0);
+module_param(check_media_type, bool, 0);
+module_param(mrw_format_restart, bool, 0);
 
 static spinlock_t cdrom_lock = SPIN_LOCK_UNLOCKED;
drivers/char/lp.c +2 -2
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .22800-linux-2.6-bk/drivers/char/lp.c .22800-linux-2.6-bk.updated/drivers/char/lp.c
@@ -749,8 +749,8 @@ static int parport_nr[LP_NO] = { [0 ... 
 static char *parport[LP_NO] = { NULL,  };
 static int reset = 0;
 
-MODULE_PARM(parport, "1-" __MODULE_STRING(LP_NO) "s");
-MODULE_PARM(reset, "i");
+module_param_array(parport, charp, NULL, 0);
+module_param(reset, bool, 0);
 
 #ifndef MODULE
 static int __init lp_setup (char *str)
drivers/ide/ide-cd.c +1 -1
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .22800-linux-2.6-bk/drivers/ide/ide-cd.c .22800-linux-2.6-bk.updated/drivers/ide/ide-cd.c
@@ -3433,7 +3433,7 @@ static struct block_device_operations id
 /* options */
 char *ignore = NULL;
 
-MODULE_PARM(ignore, "s");
+module_param(ignore, charp, 0400);
 MODULE_DESCRIPTION("ATAPI CD-ROM Driver");
 
 static int ide_cdrom_attach (ide_drive_t *drive)
drivers/net/8139too.c +4 -4
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .22800-linux-2.6-bk/drivers/net/8139too.c .22800-linux-2.6-bk.updated/drivers/net/8139too.c
@@ -599,10 +599,10 @@ MODULE_AUTHOR ("Jeff Garzik <jgarzik@pob
 MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver");
 MODULE_LICENSE("GPL");
 
-MODULE_PARM (multicast_filter_limit, "i");
-MODULE_PARM (media, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM (full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i");
-MODULE_PARM (debug, "i");
+module_param(multicast_filter_limit, int, 0);
+module_param_array(media, int, NULL, 0);
+module_param_array(full_duplex, int, NULL, 0);
+module_param(debug, int, 0);
 MODULE_PARM_DESC (debug, "8139too bitmapped message enable number");
 MODULE_PARM_DESC (multicast_filter_limit, "8139too maximum number of filtered multicast addresses");
 MODULE_PARM_DESC (media, "8139too: Bits 4+9: force full duplex, bit 5: 100Mbps");
drivers/net/s2io.c +8 -8
diff -urpN --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal .22800-linux-2.6-bk/drivers/net/s2io.c .22800-linux-2.6-bk.updated/drivers/net/s2io.c
@@ -3983,14 +3983,14 @@ static void s2io_init_pci(nic_t * sp)
 
 MODULE_AUTHOR("Raghavendra Koushik <[email protected]>");
 MODULE_LICENSE("GPL");
-MODULE_PARM(ring_num, "1-" __MODULE_STRING(1) "i");
-MODULE_PARM(frame_len, "1-" __MODULE_STRING(8) "i");
-MODULE_PARM(ring_len, "1-" __MODULE_STRING(8) "i");
-MODULE_PARM(fifo_num, "1-" __MODULE_STRING(1) "i");
-MODULE_PARM(fifo_len, "1-" __MODULE_STRING(8) "i");
-MODULE_PARM(rx_prio, "1-" __MODULE_STRING(1) "i");
-MODULE_PARM(tx_prio, "1-" __MODULE_STRING(1) "i");
-MODULE_PARM(latency_timer, "1-" __MODULE_STRING(1) "i");
+module_param(ring_num, uint, 0);
+module_param_array(frame_len, uint, NULL, 0);
+module_param_array(ring_len, uint, NULL, 0);
+module_param(fifo_num, uint, 0);
+module_param_array(fifo_len, uint, NULL, 0);
+module_param(rx_prio, uint, 0);
+module_param(tx_prio, uint, 0);
+module_param(latency_timer, byte, 0);
 
 /*
 *  Input Argument/s:
Signature · 1 line
Anyone who quotes me in their signature is an idiot -- Rusty Russell
#1 lore raw

Hi Rusty,

At Wed, 20 Oct 2004 17:50:09 +1000,

drivers/char/lp.c static int parport_nr[LP_NO] = { [0 ... · line 752

Quoted 7 lines · Rusty Russell
drivers/char/lp.c +1 -2
@@ -749,8 +749,8 @@ static int parport_nr[LP_NO] = { [0 ... 
 static char *parport[LP_NO] = { NULL,  };
 static int reset = 0;
 
-MODULE_PARM(parport, "1-" __MODULE_STRING(LP_NO) "s");
-MODULE_PARM(reset, "i");
+module_param_array(parport, charp, NULL, 0);

Can module_param_array() now take NULL for the third argument?

If yes, I'll clean up ALSA codes, which don't use the num argument at all and pass just a dummy variable there.

Thanks,

--
Takashi Iwai <[email protected]> ALSA Developer - www.alsa-project.org

author
#2 lore raw
Quoted 8 lines · Takashi Iwai

Hi Rusty,

At Wed, 20 Oct 2004 17:50:09 +1000,

Quoted 4 lines · Rusty Russell
drivers/char/lp.c +0 -0
@@ -749,8 +749,8 @@ static int parport_nr[LP_NO] = { [0 ... 
 static char *parport[LP_NO] = { NULL,  };
 static int reset = 0;
Quoted 5 lines

drivers/char/lp.c static int parport_nr[LP_NO] = { [0 ... · line 752

Quoted 3 lines
drivers/char/lp.c +1 -2
-MODULE_PARM(parport, "1-" __MODULE_STRING(LP_NO) "s");
-MODULE_PARM(reset, "i");
+module_param_array(parport, charp, NULL, 0);

Can module_param_array() now take NULL for the third argument?

Yes, it was looking at the ALSA code in particular that I decided we needed this, and hence the change. My patch cleans most of those up, I think.

Thanks!
Rusty.

Signature · 1 line
Anyone who quotes me in their signature is an idiot -- Rusty Russell
#3 lore raw

At Thu, 21 Oct 2004 10:52:12 +1000,

Quoted 16 lines · Rusty Russell
Quoted 8 lines · Takashi Iwai

Hi Rusty,

At Wed, 20 Oct 2004 17:50:09 +1000,

Quoted 4 lines · Rusty Russell
drivers/char/lp.c +0 -0
@@ -749,8 +749,8 @@ static int parport_nr[LP_NO] = { [0 ... 
 static char *parport[LP_NO] = { NULL,  };
 static int reset = 0;
Quoted 5 lines

drivers/char/lp.c static int parport_nr[LP_NO] = { [0 ... · line 752

Quoted 3 lines
drivers/char/lp.c +1 -2
-MODULE_PARM(parport, "1-" __MODULE_STRING(LP_NO) "s");
-MODULE_PARM(reset, "i");
+module_param_array(parport, charp, NULL, 0);

Can module_param_array() now take NULL for the third argument?

Quoted 3 lines

Yes, it was looking at the ALSA code in particular that I decided we needed this, and hence the change. My patch cleans most of those up, I think.

Great, thanks!

Takashi