Name: Parameter Changes: Networking Depends: Module/param.patch.gz Author: Rusty Russell D: This replaces all the occurrances of __setup and MODULE_PARM in the D: network files and drivers with the new PARAM calls. diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/3c501.c working-2.4.14-param-all/drivers/net/3c501.c --- working-2.4.14-param/drivers/net/3c501.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/3c501.c Thu Nov 22 08:21:40 2001 @@ -925,8 +925,8 @@ static int io=0x280; static int irq=5; -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); +PARAM(io, int, 000); +PARAM(irq, int, 000); MODULE_PARM_DESC(io, "EtherLink I/O base address"); MODULE_PARM_DESC(irq, "EtherLink IRQ number"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/3c503.c working-2.4.14-param-all/drivers/net/3c503.c --- working-2.4.14-param/drivers/net/3c503.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/3c503.c Thu Nov 22 08:21:40 2001 @@ -614,9 +614,9 @@ static int io[MAX_EL2_CARDS]; static int irq[MAX_EL2_CARDS]; static int xcvr[MAX_EL2_CARDS]; /* choose int. or ext. xcvr */ -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_EL2_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_EL2_CARDS) "i"); -MODULE_PARM(xcvr, "1-" __MODULE_STRING(MAX_EL2_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_EL2_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_EL2_CARDS, 000); +PARAM_ARRAY(xcvr, xcvr, int, 1, MAX_EL2_CARDS, 000); MODULE_PARM_DESC(io, "EtherLink II I/O base address(es)"); MODULE_PARM_DESC(irq, "EtherLink II IRQ number(s) (assigned)"); MODULE_PARM_DESC(xcvr, "EtherLink II tranceiver(s) (0=internal, 1=external)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/3c505.c working-2.4.14-param-all/drivers/net/3c505.c --- working-2.4.14-param/drivers/net/3c505.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/3c505.c Thu Nov 22 08:21:40 2001 @@ -1621,9 +1621,9 @@ static int io[ELP_MAX_CARDS]; static int irq[ELP_MAX_CARDS]; static int dma[ELP_MAX_CARDS]; -MODULE_PARM(io, "1-" __MODULE_STRING(ELP_MAX_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(ELP_MAX_CARDS) "i"); -MODULE_PARM(dma, "1-" __MODULE_STRING(ELP_MAX_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, ELP_MAX_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, ELP_MAX_CARDS, 000); +PARAM_ARRAY(dma, dma, int, 1, ELP_MAX_CARDS, 000); MODULE_PARM_DESC(io, "EtherLink Plus I/O base address(es)"); MODULE_PARM_DESC(irq, "EtherLink Plus IRQ number(s) (assigned)"); MODULE_PARM_DESC(dma, "EtherLink Plus DMA channel(s)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/3c507.c working-2.4.14-param-all/drivers/net/3c507.c --- working-2.4.14-param/drivers/net/3c507.c Mon Oct 1 05:26:08 2001 +++ working-2.4.14-param-all/drivers/net/3c507.c Thu Nov 22 08:21:40 2001 @@ -868,8 +868,8 @@ static struct net_device dev_3c507; static int io = 0x300; static int irq; -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); +PARAM(io, int, 000); +PARAM(irq, int, 000); MODULE_PARM_DESC(io, "EtherLink16 I/O base address"); MODULE_PARM_DESC(irq, "(ignored)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/3c509.c working-2.4.14-param-all/drivers/net/3c509.c --- working-2.4.14-param/drivers/net/3c509.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/3c509.c Thu Nov 22 08:21:40 2001 @@ -1009,16 +1009,16 @@ static int irq[] = {-1, -1, -1, -1, -1, -1, -1, -1}; static int xcvr[] = {-1, -1, -1, -1, -1, -1, -1, -1}; -MODULE_PARM(debug,"i"); -MODULE_PARM(irq,"1-8i"); -MODULE_PARM(xcvr,"1-8i"); -MODULE_PARM(max_interrupt_work, "i"); +PARAM(debug, int, 000); +PARAM_ARRAY(irq, irq, int, 1, 8, 000); +PARAM_ARRAY(xcvr, xcvr, int, 1, 8, 000); +PARAM(max_interrupt_work, int, 000); MODULE_PARM_DESC(debug, "EtherLink III debug level (0-6)"); MODULE_PARM_DESC(irq, "EtherLink III IRQ number(s) (assigned)"); MODULE_PARM_DESC(xcvr,"EtherLink III tranceiver(s) (0=internal, 1=external)"); MODULE_PARM_DESC(max_interrupt_work, "EtherLink III maximum events handled per interrupt"); #ifdef CONFIG_ISAPNP -MODULE_PARM(nopnp, "i"); +PARAM(nopnp, int, 000); MODULE_PARM_DESC(nopnp, "EtherLink III disable ISA PnP support (0-1)"); #endif /* CONFIG_ISAPNP */ @@ -1061,6 +1061,9 @@ el3_root_dev = next_dev; } } + +module_init(init_module); +module_exit(cleanup_module); #endif /* MODULE */ /* diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/3c515.c working-2.4.14-param-all/drivers/net/3c515.c --- working-2.4.14-param/drivers/net/3c515.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/3c515.c Thu Nov 22 08:21:40 2001 @@ -25,7 +25,7 @@ /* "Knobs" that adjust features and parameters. */ /* Set the copy breakpoint for the copy-only-tiny-frames scheme. Setting to > 1512 effectively disables this feature. */ -static const int rx_copybreak = 200; +static int rx_copybreak = 200; /* Allow setting MTU to a larger size, bypassing the normal ethernet setup. */ static const int mtu = 1500; @@ -63,6 +63,7 @@ #include #include #include +#include #include #include #include @@ -84,15 +85,6 @@ MODULE_DESCRIPTION("3Com 3c515 Corkscrew driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM_DESC(debug, "3c515 debug level (0-6)"); -MODULE_PARM_DESC(options, "3c515: Bits 0-2: media type, bit 3: full duplex, bit 4: bus mastering"); -MODULE_PARM_DESC(rx_copybreak, "3c515 copy breakpoint for copy-only-tiny-frames"); -MODULE_PARM_DESC(max_interrupt_work, "3c515 maximum events handled per interrupt"); - /* "Knobs" for adjusting internal parameters. */ /* Put out somewhat more debugging messages. (0 - no msg, 1 minimal msgs). */ #define DRIVER_DEBUG 1 @@ -411,8 +403,18 @@ /* Note: this is the only limit on the number of cards supported!! */ static int options[8] = { -1, -1, -1, -1, -1, -1, -1, -1, }; -#ifdef MODULE static int debug = -1; + +PARAM(debug, int, 000); +PARAM_ARRAY(options, options, int, 1, 8, 000); +PARAM(rx_copybreak, int, 000); +PARAM(max_interrupt_work, int, 000); +MODULE_PARM_DESC(debug, "3c515 debug level (0-6)"); +MODULE_PARM_DESC(options, "3c515: Bits 0-2: media type, bit 3: full duplex, bit 4: bus mastering"); +MODULE_PARM_DESC(rx_copybreak, "3c515 copy breakpoint for copy-only-tiny-frames"); +MODULE_PARM_DESC(max_interrupt_work, "3c515 maximum events handled per interrupt"); + +#ifdef MODULE /* A list of all installed Vortex devices, for removing the driver module. */ static struct net_device *root_corkscrew_dev; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/3c523.c working-2.4.14-param-all/drivers/net/3c523.c --- working-2.4.14-param/drivers/net/3c523.c Thu Jun 21 04:10:53 2001 +++ working-2.4.14-param-all/drivers/net/3c523.c Thu Nov 22 08:21:40 2001 @@ -1224,8 +1224,8 @@ static struct net_device dev_elmc[MAX_3C523_CARDS]; static int irq[MAX_3C523_CARDS]; static int io[MAX_3C523_CARDS]; -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_3C523_CARDS) "i"); -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_3C523_CARDS) "i"); +PARAM_ARRAY(irq, irq, int, 1, MAX_3C523_CARDS, 000); +PARAM_ARRAY(io, io, int, 1, MAX_3C523_CARDS, 000); MODULE_PARM_DESC(io, "EtherLink/MC I/O base address(es)"); MODULE_PARM_DESC(irq, "EtherLink/MC IRQ number(s)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/3c59x.c working-2.4.14-param-all/drivers/net/3c59x.c --- working-2.4.14-param/drivers/net/3c59x.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/3c59x.c Thu Nov 22 08:21:40 2001 @@ -196,11 +196,11 @@ /* Set the copy breakpoint for the copy-only-tiny-frames scheme. Setting to > 1512 effectively disables this feature. */ #ifndef __arm__ -static const int rx_copybreak = 200; +static int rx_copybreak = 200; #else /* ARM systems perform better by disregarding the bus-master transfer capability of these cards. -- rmk */ -static const int rx_copybreak = 1513; +static int rx_copybreak = 1513; #endif /* Allow setting MTU to a larger size, bypassing the normal ethernet setup. */ static const int mtu = 1500; @@ -269,31 +269,6 @@ DRV_VERSION " " DRV_RELDATE); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(hw_checksums, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(flow_ctrl, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(enable_wol, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(compaq_ioaddr, "i"); -MODULE_PARM(compaq_irq, "i"); -MODULE_PARM(compaq_device_id, "i"); -MODULE_PARM(watchdog, "i"); -MODULE_PARM_DESC(debug, "3c59x debug level (0-6)"); -MODULE_PARM_DESC(options, "3c59x: Bits 0-3: media type, bit 4: bus mastering, bit 9: full duplex"); -MODULE_PARM_DESC(full_duplex, "3c59x full duplex setting(s) (1)"); -MODULE_PARM_DESC(hw_checksums, "3c59x Hardware checksum checking by adapter(s) (0-1)"); -MODULE_PARM_DESC(flow_ctrl, "3c59x 802.3x flow control usage (PAUSE only) (0-1)"); -MODULE_PARM_DESC(enable_wol, "3c59x: Turn on Wake-on-LAN for adapter(s) (0-1)"); -MODULE_PARM_DESC(rx_copybreak, "3c59x copy breakpoint for copy-only-tiny-frames"); -MODULE_PARM_DESC(max_interrupt_work, "3c59x maximum events handled per interrupt"); -MODULE_PARM_DESC(compaq_ioaddr, "3c59x PCI I/O base address (Compaq BIOS problem workaround)"); -MODULE_PARM_DESC(compaq_irq, "3c59x PCI IRQ number (Compaq BIOS problem workaround)"); -MODULE_PARM_DESC(compaq_device_id, "3c59x PCI device ID (Compaq BIOS problem workaround)"); -MODULE_PARM_DESC(watchdog, "3c59x transmit timeout in milliseconds"); - /* Operational parameter that usually are not changed. */ /* The Vortex size is twice that of the original EtherLinkIII series: the @@ -863,6 +838,31 @@ static int compaq_ioaddr, compaq_irq, compaq_device_id = 0x5900; static int vortex_cards_found; + +PARAM(debug, int, 000); +PARAM_ARRAY(options, options, int, 1, 8, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, 8, 000); +PARAM_ARRAY(hw_checksums, hw_checksums, int, 1, 8, 000); +PARAM_ARRAY(flow_ctrl, flow_ctrl, int, 1, 8, 000); +PARAM_ARRAY(enable_wol, enable_wol, int, 1, 8, 000); +PARAM(rx_copybreak, int, 000); +PARAM(max_interrupt_work, int, 000); +PARAM(compaq_ioaddr, int, 000); +PARAM(compaq_irq, int, 000); +PARAM(compaq_device_id, int, 000); +PARAM(watchdog, int, 000); +MODULE_PARM_DESC(debug, "3c59x debug level (0-6)"); +MODULE_PARM_DESC(options, "3c59x: Bits 0-3: media type, bit 4: bus mastering, bit 9: full duplex"); +MODULE_PARM_DESC(full_duplex, "3c59x full duplex setting(s) (1)"); +MODULE_PARM_DESC(hw_checksums, "3c59x Hardware checksum checking by adapter(s) (0-1)"); +MODULE_PARM_DESC(flow_ctrl, "3c59x 802.3x flow control usage (PAUSE only) (0-1)"); +MODULE_PARM_DESC(enable_wol, "3c59x: Turn on Wake-on-LAN for adapter(s) (0-1)"); +MODULE_PARM_DESC(rx_copybreak, "3c59x copy breakpoint for copy-only-tiny-frames"); +MODULE_PARM_DESC(max_interrupt_work, "3c59x maximum events handled per interrupt"); +MODULE_PARM_DESC(compaq_ioaddr, "3c59x PCI I/O base address (Compaq BIOS problem workaround)"); +MODULE_PARM_DESC(compaq_irq, "3c59x PCI IRQ number (Compaq BIOS problem workaround)"); +MODULE_PARM_DESC(compaq_device_id, "3c59x PCI device ID (Compaq BIOS problem workaround)"); +MODULE_PARM_DESC(watchdog, "3c59x transmit timeout in milliseconds"); #ifdef CONFIG_PM diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/8139cp.c working-2.4.14-param-all/drivers/net/8139cp.c --- working-2.4.14-param/drivers/net/8139cp.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/8139cp.c Thu Nov 22 08:35:15 2001 @@ -67,13 +67,13 @@ MODULE_LICENSE("GPL"); static int debug = -1; -MODULE_PARM (debug, "i"); +PARAM(debug, bool, S_IWUSR|S_IRUGO); MODULE_PARM_DESC (debug, "8139cp bitmapped message enable number"); /* Maximum number of multicast addresses to filter (vs. Rx-all-multicast). The RTL chips use a 64 element hash table based on the Ethernet CRC. */ static int multicast_filter_limit = 32; -MODULE_PARM (multicast_filter_limit, "i"); +PARAM(multicast_filter_limit, int, 000); MODULE_PARM_DESC (multicast_filter_limit, "8139cp maximum number of filtered multicast addresses"); /* Set the copy breakpoint for the copy-only-tiny-buffer Rx structure. */ @@ -84,7 +84,7 @@ #else static int rx_copybreak = 100; #endif -MODULE_PARM (rx_copybreak, "i"); +PARAM (rx_copybreak, int, 000); MODULE_PARM_DESC (rx_copybreak, "8139cp Breakpoint at which Rx packets are copied"); #define PFX DRV_NAME ": " diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/8139too.c working-2.4.14-param-all/drivers/net/8139too.c --- working-2.4.14-param/drivers/net/8139too.c Sat Oct 20 01:32:28 2001 +++ working-2.4.14-param-all/drivers/net/8139too.c Thu Nov 22 08:21:40 2001 @@ -622,14 +622,17 @@ MODULE_DESCRIPTION ("RealTek RTL-8139 Fast Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM (multicast_filter_limit, "i"); -MODULE_PARM (max_interrupt_work, "i"); -MODULE_PARM (media, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM (full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); + +PARAM(multicast_filter_limit, int, S_IRUGO); +PARAM(max_interrupt_work, int, S_IWUSR|S_IRUGO); +PARAM_ARRAY(media, media, int, 1, MAX_UNITS, S_IRUGO); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, S_IRUGO); +/* MODULE_PARM_DESC (multicast_filter_limit, "8139too maximum number of filtered multicast addresses"); MODULE_PARM_DESC (max_interrupt_work, "8139too maximum events handled per interrupt"); MODULE_PARM_DESC (media, "8139too: Bits 4+9: force full duplex, bit 5: 100Mbps"); MODULE_PARM_DESC (full_duplex, "8139too: Force full duplex for board(s) (1)"); +*/ static int read_eeprom (void *ioaddr, int location, int addr_len); static int rtl8139_open (struct net_device *dev); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/82596.c working-2.4.14-param-all/drivers/net/82596.c --- working-2.4.14-param/drivers/net/82596.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/82596.c Thu Nov 22 08:21:40 2001 @@ -152,7 +152,7 @@ MODULE_DESCRIPTION("i82596 driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(i596_debug, "i"); +PARAM(i596_debug, int, 000); MODULE_PARM_DESC(i596_debug, "i82596 debug mask"); @@ -1495,11 +1495,11 @@ #ifdef ENABLE_APRICOT static int io = 0x300; static int irq = 10; -MODULE_PARM(irq, "i"); +PARAM(irq, int, 000); MODULE_PARM_DESC(irq, "Apricot IRQ number"); #endif -MODULE_PARM(debug, "i"); +PARAM(debug, int, 000); MODULE_PARM_DESC(debug, "i82596 debug mask"); static int debug = -1; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ac3200.c working-2.4.14-param-all/drivers/net/ac3200.c --- working-2.4.14-param/drivers/net/ac3200.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/ac3200.c Thu Nov 22 08:21:40 2001 @@ -343,9 +343,9 @@ static int io[MAX_AC32_CARDS]; static int irq[MAX_AC32_CARDS]; static int mem[MAX_AC32_CARDS]; -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_AC32_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_AC32_CARDS) "i"); -MODULE_PARM(mem, "1-" __MODULE_STRING(MAX_AC32_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_AC32_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_AC32_CARDS, 000); +PARAM_ARRAY(mem, mem, int, 1, MAX_AC32_CARDS, 000); MODULE_PARM_DESC(io, "ac3200 I/O base adress(es)"); MODULE_PARM_DESC(irq, "ac3200 IRQ number(s)"); MODULE_PARM_DESC(mem, "ac3200 Memory base address(es)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/acenic.c working-2.4.14-param-all/drivers/net/acenic.c --- working-2.4.14-param/drivers/net/acenic.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/acenic.c Thu Nov 22 08:21:40 2001 @@ -761,12 +761,12 @@ MODULE_AUTHOR("Jes Sorensen "); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("AceNIC/3C985/GA620 Gigabit Ethernet driver"); -MODULE_PARM(link, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(trace, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(tx_coal_tick, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(max_tx_desc, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(rx_coal_tick, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(max_rx_desc, "1-" __MODULE_STRING(8) "i"); +PARAM_ARRAY(link, link, int, 1, 8, 000); +PARAM_ARRAY(trace, trace, int, 1, 8, 000); +PARAM_ARRAY(tx_coal_tick, tx_coal_tick, int, 1, 8, 000); +PARAM_ARRAY(max_tx_desc, max_tx_desc, int, 1, 8, 000); +PARAM_ARRAY(rx_coal_tick, rx_coal_tick, int, 1, 8, 000); +PARAM_ARRAY(max_rx_desc, max_rx_desc, int, 1, 8, 000); MODULE_PARM_DESC(link, "Acenic/3C985/NetGear link state"); MODULE_PARM_DESC(trace, "Acenic/3C985/NetGear firmware trace level"); MODULE_PARM_DESC(tx_coal_tick, "AceNIC/3C985/GA620 max clock ticks to wait from first tx descriptor arrives"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/aironet4500_card.c working-2.4.14-param-all/drivers/net/aironet4500_card.c --- working-2.4.14-param/drivers/net/aironet4500_card.c Mon Oct 1 05:26:08 2001 +++ working-2.4.14-param-all/drivers/net/aironet4500_card.c Thu Nov 22 08:21:40 2001 @@ -525,9 +525,9 @@ EXPORT_SYMBOL(irq); EXPORT_SYMBOL(io); */ -MODULE_PARM(irq,"i"); +PARAM(irq, int, 000); MODULE_PARM_DESC(irq,"Aironet 4x00 ISA non-PNP irqs,required"); -MODULE_PARM(io,"i"); +PARAM(io, int, 000); MODULE_PARM_DESC(io,"Aironet 4x00 ISA non-PNP ioports,required"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/aironet4500_core.c working-2.4.14-param-all/drivers/net/aironet4500_core.c --- working-2.4.14-param/drivers/net/aironet4500_core.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/aironet4500_core.c Thu Nov 22 08:21:40 2001 @@ -2563,18 +2563,18 @@ #if LINUX_VERSION_CODE >= 0x20100 -MODULE_PARM(awc_debug,"i"); -MODULE_PARM(tx_rate,"i"); -MODULE_PARM(channel,"i"); +PARAM(awc_debug, int, 000); +PARAM(tx_rate, int, 000); +PARAM(channel, int, 000); //MODULE_PARM(tx_full_rate,"i"); -MODULE_PARM(adhoc,"i"); -MODULE_PARM(master,"i"); -MODULE_PARM(slave,"i"); -MODULE_PARM(awc_simple_bridge,"i"); -MODULE_PARM(max_mtu,"i"); -MODULE_PARM(large_buff_mem,"i"); -MODULE_PARM(small_buff_no,"i"); -MODULE_PARM(SSID,"c33"); +PARAM(adhoc, int, 000); +PARAM(master, int, 000); +PARAM(slave, int, 000); +PARAM(awc_simple_bridge, int, 000); +PARAM(max_mtu, int, 000); +PARAM(large_buff_mem, int, 000); +PARAM(small_buff_no, int, 000); +PARAM_ARRAY(SSID, SSID, byte, 33, 33, S_IRUGO); MODULE_PARM_DESC(awc_debug,"Aironet debug mask"); MODULE_PARM_DESC(channel,"Aironet "); MODULE_PARM_DESC(adhoc,"Aironet Access Points not available (0-1)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/appletalk/cops.c working-2.4.14-param-all/drivers/net/appletalk/cops.c --- working-2.4.14-param/drivers/net/appletalk/cops.c Mon Sep 10 03:45:43 2001 +++ working-2.4.14-param-all/drivers/net/appletalk/cops.c Thu Nov 22 08:21:40 2001 @@ -1015,9 +1015,9 @@ static struct net_device cops0_dev = { init: cops_probe }; MODULE_LICENSE("GPL"); -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(board_type, "i"); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(board_type, int, 000); int init_module(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/appletalk/ipddp.c working-2.4.14-param-all/drivers/net/appletalk/ipddp.c --- working-2.4.14-param/drivers/net/appletalk/ipddp.c Mon Sep 10 03:45:43 2001 +++ working-2.4.14-param-all/drivers/net/appletalk/ipddp.c Thu Nov 22 08:21:40 2001 @@ -284,7 +284,7 @@ static struct net_device dev_ipddp; MODULE_LICENSE("GPL"); -MODULE_PARM(ipddp_mode, "i"); +PARAM(ipddp_mode, int, 000); static int __init ipddp_init_module(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/appletalk/ltpc.c working-2.4.14-param-all/drivers/net/appletalk/ltpc.c --- working-2.4.14-param/drivers/net/appletalk/ltpc.c Mon Sep 10 03:45:43 2001 +++ working-2.4.14-param-all/drivers/net/appletalk/ltpc.c Thu Nov 22 08:21:40 2001 @@ -1218,51 +1218,15 @@ return 0; } -#ifndef MODULE -/* handles "ltpc=io,irq,dma" kernel command lines */ -static int __init ltpc_setup(char *str) -{ - int ints[5]; - - str = get_options(str, ARRAY_SIZE(ints), ints); - - if (ints[0] == 0) { - if (str && !strncmp(str, "auto", 4)) { - /* do nothing :-) */ - } - else { - /* usage message */ - printk (KERN_ERR - "ltpc: usage: ltpc=auto|iobase[,irq[,dma]]\n"); - return 0; - } - } else { - io = ints[1]; - if (ints[0] > 1) { - irq = ints[2]; - } - if (ints[0] > 2) { - dma = ints[3]; - } - /* ignore any other paramters */ - } - return 1; -} - -__setup("ltpc=", ltpc_setup); -#endif /* MODULE */ - static struct net_device dev_ltpc; -#ifdef MODULE - MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(dma, "i"); - +PARAM(debug, int, 000); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(dma, int, 000); +#ifdef MODULE int __init init_module(void) { int err, result; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/arcnet/arc-rimi.c working-2.4.14-param-all/drivers/net/arcnet/arc-rimi.c --- working-2.4.14-param/drivers/net/arcnet/arc-rimi.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/arcnet/arc-rimi.c Thu Nov 22 08:21:40 2001 @@ -293,10 +293,10 @@ static int irq = 0; /* or use the insmod io= irq= shmem= options */ static char *device; /* use eg. device="arc1" to change name */ -MODULE_PARM(node, "i"); -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(device, "s"); +PARAM(node, int, 000); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(device, charp, 000); int init_module(void) { @@ -334,41 +334,5 @@ kfree(dev->priv); kfree(dev); } - -#else - -static int __init arcrimi_setup(char *s) -{ - struct net_device *dev; - int ints[8]; - - s = get_options(s, 8, ints); - if (!ints[0]) - return 1; - dev = alloc_bootmem(sizeof(struct net_device)); - memset(dev, 0, sizeof(struct net_device)); - dev->init = arcrimi_probe; - - switch (ints[0]) { - default: /* ERROR */ - printk("arcrimi: Too many arguments.\n"); - case 3: /* Node ID */ - dev->dev_addr[0] = ints[3]; - case 2: /* IRQ */ - dev->irq = ints[2]; - case 1: /* IO address */ - dev->mem_start = ints[1]; - } - if (*s) - strncpy(dev->name, s, 9); - else - strcpy(dev->name, "arc%d"); - if (register_netdev(dev)) - printk(KERN_ERR "arc-rimi: Cannot register arcnet device\n"); - - return 1; -} - -__setup("arcrimi=", arcrimi_setup); #endif /* MODULE */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/arcnet/arcnet.c working-2.4.14-param-all/drivers/net/arcnet/arcnet.c --- working-2.4.14-param/drivers/net/arcnet/arcnet.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/arcnet/arcnet.c Thu Nov 22 08:21:40 2001 @@ -162,7 +162,7 @@ #ifdef MODULE static int debug = ARCNET_DEBUG; -MODULE_PARM(debug, "i"); +PARAM(debug, int, 000); int __init init_module(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/arcnet/com20020-isa.c working-2.4.14-param-all/drivers/net/arcnet/com20020-isa.c --- working-2.4.14-param/drivers/net/arcnet/com20020-isa.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/arcnet/com20020-isa.c Thu Nov 22 08:21:40 2001 @@ -125,14 +125,14 @@ static int clockp = 0; static int clockm = 0; -MODULE_PARM(node, "i"); -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(device, "s"); -MODULE_PARM(timeout, "i"); -MODULE_PARM(backplane, "i"); -MODULE_PARM(clockp, "i"); -MODULE_PARM(clockm, "i"); +PARAM(node, int, 000); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(device, charp, 000); +PARAM(timeout, int, 000); +PARAM(backplane, int, 000); +PARAM(clockp, int, 000); +PARAM(clockm, int, 000); static void com20020isa_open_close(struct net_device *dev, bool open) { @@ -182,49 +182,5 @@ { com20020_remove(my_dev); } - -#else - -static int __init com20020isa_setup(char *s) -{ - struct net_device *dev; - struct arcnet_local *lp; - int ints[8]; - - s = get_options(s, 8, ints); - if (!ints[0]) - return 1; - dev = alloc_bootmem(sizeof(struct net_device) + sizeof(struct arcnet_local)); - memset(dev, 0, sizeof(struct net_device) + sizeof(struct arcnet_local)); - lp = dev->priv = (struct arcnet_local *) (dev + 1); - dev->init = com20020isa_probe; - - switch (ints[0]) { - default: /* ERROR */ - printk("com90xx: Too many arguments.\n"); - case 6: /* Timeout */ - lp->timeout = ints[6]; - case 5: /* CKP value */ - lp->clockp = ints[5]; - case 4: /* Backplane flag */ - lp->backplane = ints[4]; - case 3: /* Node ID */ - dev->dev_addr[0] = ints[3]; - case 2: /* IRQ */ - dev->irq = ints[2]; - case 1: /* IO address */ - dev->base_addr = ints[1]; - } - if (*s) - strncpy(dev->name, s, 9); - else - strcpy(dev->name, "arc%d"); - if (register_netdev(dev)) - printk(KERN_ERR "com20020: Cannot register arcnet device\n"); - - return 1; -} - -__setup("com20020=", com20020isa_setup); #endif /* MODULE */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/arcnet/com20020-pci.c working-2.4.14-param-all/drivers/net/arcnet/com20020-pci.c --- working-2.4.14-param/drivers/net/arcnet/com20020-pci.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/arcnet/com20020-pci.c Thu Nov 22 08:21:40 2001 @@ -51,12 +51,12 @@ static int clockp; static int clockm; -MODULE_PARM(node, "i"); -MODULE_PARM(device, "s"); -MODULE_PARM(timeout, "i"); -MODULE_PARM(backplane, "i"); -MODULE_PARM(clockp, "i"); -MODULE_PARM(clockm, "i"); +PARAM(node, int, 000); +PARAM(device, charp, 000); +PARAM(timeout, int, 000); +PARAM(backplane, int, 000); +PARAM(clockp, int, 000); +PARAM(clockm, int, 000); static void com20020pci_open_close(struct net_device *dev, bool open) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/arcnet/com90io.c working-2.4.14-param-all/drivers/net/arcnet/com90io.c --- working-2.4.14-param/drivers/net/arcnet/com90io.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/arcnet/com90io.c Thu Nov 22 08:21:40 2001 @@ -377,9 +377,9 @@ static int irq; static char *device; /* use eg. device=arc1 to change name */ -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(device, "s"); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(device, charp, 000); int init_module(void) { @@ -417,39 +417,5 @@ kfree(dev->priv); kfree(dev); } - -#else - -static int __init com90io_setup(char *s) -{ - struct net_device *dev; - int ints[4]; - - s = get_options(s, 4, ints); - if (!ints[0]) - return 0; - dev = alloc_bootmem(sizeof(struct net_device)); - memset(dev, 0, sizeof(struct net_device)); - dev->init = com90io_probe; - - switch (ints[0]) { - default: /* ERROR */ - printk("com90io: Too many arguments.\n"); - case 2: /* IRQ */ - dev->irq = ints[2]; - case 1: /* IO address */ - dev->base_addr = ints[1]; - } - if (*s) - strncpy(dev->name, s, 9); - else - strcpy(dev->name, "arc%d"); - if (register_netdev(dev)) - printk(KERN_ERR "com90io: Cannot register arcnet device\n"); - - return 1; -} - -__setup("com90io=", com90io_setup); #endif /* MODULE */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/arcnet/com90xx.c working-2.4.14-param-all/drivers/net/arcnet/com90xx.c --- working-2.4.14-param/drivers/net/arcnet/com90xx.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/arcnet/com90xx.c Thu Nov 22 08:21:40 2001 @@ -615,10 +615,10 @@ static int shmem; static char *device; /* use eg. device=arc1 to change name */ -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(shmem, "i"); -MODULE_PARM(device, "s"); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(shmem, int, 000); +PARAM(device, charp, 000); int init_module(void) { @@ -663,45 +663,5 @@ kfree(dev); } } - -#else - -static int __init com90xx_setup(char *s) -{ - struct net_device *dev; - int ints[8]; - - com90xx_skip_probe = 1; - - s = get_options(s, 8, ints); - if (!ints[0] && !*s) { - printk("com90xx: Disabled.\n"); - return 1; - } - dev = alloc_bootmem(sizeof(struct net_device)); - memset(dev, 0, sizeof(struct net_device)); - dev->init = com90xx_probe; - - switch (ints[0]) { - default: /* ERROR */ - printk("com90xx: Too many arguments.\n"); - case 3: /* Mem address */ - dev->mem_start = ints[3]; - case 2: /* IRQ */ - dev->irq = ints[2]; - case 1: /* IO address */ - dev->base_addr = ints[1]; - } - if (*s) - strncpy(dev->name, s, 9); - else - strcpy(dev->name, "arc%d"); - if (register_netdev(dev)) - printk(KERN_ERR "com90xx: Cannot register arcnet device\n"); - - return 1; -} - -__setup("com90xx=", com90xx_setup); #endif /* MODULE */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/arlan.c working-2.4.14-param-all/drivers/net/arlan.c --- working-2.4.14-param/drivers/net/arlan.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/arlan.c Thu Nov 22 08:21:40 2001 @@ -41,33 +41,33 @@ static int irq = irqUNKNOWN; static int txScrambled = 1; static int mdebug; + +PARAM(irq, int, 000); +PARAM(txScrambled, int, 000); +PARAM(mdebug, int, 000); +PARAM(arlan_entry_debug, int, 000); +PARAM(arlan_exit_debug, int, 000); #endif #if LINUX_VERSION_CODE > 0x20100 -MODULE_PARM(irq, "i"); -MODULE_PARM(mem, "i"); -MODULE_PARM(probe, "i"); -MODULE_PARM(arlan_debug, "i"); -MODULE_PARM(numDevices, "i"); -MODULE_PARM(testMemory, "i"); -MODULE_PARM(spreadingCode, "i"); -MODULE_PARM(channelNumber, "i"); -MODULE_PARM(channelSet, "i"); -MODULE_PARM(systemId, "i"); -MODULE_PARM(registrationMode, "i"); -MODULE_PARM(radioNodeId, "i"); -MODULE_PARM(SID, "i"); -MODULE_PARM(txScrambled, "i"); -MODULE_PARM(keyStart, "i"); -MODULE_PARM(mdebug, "i"); -MODULE_PARM(tx_delay_ms, "i"); -MODULE_PARM(retries, "i"); -MODULE_PARM(async, "i"); -MODULE_PARM(tx_queue_len, "i"); -MODULE_PARM(arlan_entry_debug, "i"); -MODULE_PARM(arlan_exit_debug, "i"); -MODULE_PARM(arlan_entry_and_exit_debug, "i"); -MODULE_PARM(arlan_EEPROM_bad, "i"); +PARAM(mem, int, 000); +PARAM(probe, int, 000); +PARAM(arlan_debug, int, 000); +PARAM(numDevices, int, 000); +PARAM(testMemory, int, 000); +PARAM(spreadingCode, int, 000); +PARAM(channelNumber, int, 000); +PARAM(channelSet, int, 000); +PARAM(systemId, int, 000); +PARAM(registrationMode, int, 000); +PARAM(radioNodeId, int, 000); +PARAM(SID, int, 000); +PARAM(keyStart, int, 000); +PARAM(tx_delay_ms, int, 000); +PARAM(retries, int, 000); +PARAM(async, int, 000); +PARAM(tx_queue_len, int, 000); +PARAM(arlan_EEPROM_bad, int, 000); MODULE_PARM_DESC(irq, "(unused)"); MODULE_PARM_DESC(mem, "Arlan memory address for single device probing"); MODULE_PARM_DESC(probe, "Arlan probe at initialization (0-1)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/at1700.c working-2.4.14-param-all/drivers/net/at1700.c --- working-2.4.14-param/drivers/net/at1700.c Thu Oct 11 16:24:09 2001 +++ working-2.4.14-param-all/drivers/net/at1700.c Thu Nov 22 08:21:40 2001 @@ -878,9 +878,9 @@ static int io = 0x260; static int irq; -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(net_debug, "i"); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(net_debug, int, 000); MODULE_PARM_DESC(io, "AT1700/FMV18X I/O base address"); MODULE_PARM_DESC(irq, "AT1700/FMV18X IRQ number"); MODULE_PARM_DESC(net_debug, "AT1700/FMV18X debug level (0-6)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/atari_bionet.c working-2.4.14-param-all/drivers/net/atari_bionet.c --- working-2.4.14-param/drivers/net/atari_bionet.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/atari_bionet.c Thu Nov 22 08:21:40 2001 @@ -126,7 +126,7 @@ * Global variable 'bionet_debug'. Can be set at load time by 'insmod' */ unsigned int bionet_debug = NET_DEBUG; -MODULE_PARM(bionet_debug, "i"); +PARAM(bionet_debug, int, 000); MODULE_PARM_DESC(bionet_debug, "bionet debug level (0-2)"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/atari_pamsnet.c working-2.4.14-param-all/drivers/net/atari_pamsnet.c --- working-2.4.14-param/drivers/net/atari_pamsnet.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/atari_pamsnet.c Thu Nov 22 08:21:40 2001 @@ -122,7 +122,7 @@ * Global variable 'pamsnet_debug'. Can be set at load time by 'insmod' */ unsigned int pamsnet_debug = NET_DEBUG; -MODULE_PARM(pamsnet_debug, "i"); +PARAM(pamsnet_debug, int, 000); MODULE_PARM_DESC(pamsnet_debug, "pamsnet debug enable (0-1)"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/atarilance.c working-2.4.14-param-all/drivers/net/atarilance.c --- working-2.4.14-param/drivers/net/atarilance.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/atarilance.c Thu Nov 22 08:21:40 2001 @@ -82,7 +82,7 @@ #else static int lance_debug = 1; #endif -MODULE_PARM(lance_debug, "i"); +PARAM(lance_debug, int, 000); MODULE_PARM_DESC(lance_debug, "atarilance debug level (0-3)"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/atp.c working-2.4.14-param-all/drivers/net/atp.c --- working-2.4.14-param/drivers/net/atp.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/atp.c Thu Nov 22 08:21:40 2001 @@ -153,11 +153,11 @@ MODULE_DESCRIPTION("RealTek RTL8002/8012 parallel port Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(io, "1-" __MODULE_STRING(NUM_UNITS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(NUM_UNITS) "i"); -MODULE_PARM(xcvr, "1-" __MODULE_STRING(NUM_UNITS) "i"); +PARAM(max_interrupt_work, int, 000); +PARAM(debug, int, 000); +PARAM_ARRAY(io, io, int, 1, NUM_UNITS, 000); +PARAM_ARRAY(irq, irq, int, 1, NUM_UNITS, 000); +PARAM_ARRAY(xcvr, xcvr, int, 1, NUM_UNITS, 000); MODULE_PARM_DESC(max_interrupt_work, "ATP maximum events handled per interrupt"); MODULE_PARM_DESC(debug, "ATP debug level (0-7)"); MODULE_PARM_DESC(io, "ATP I/O base address(es)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/bagetlance.c working-2.4.14-param-all/drivers/net/bagetlance.c --- working-2.4.14-param/drivers/net/bagetlance.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/bagetlance.c Thu Nov 22 08:21:40 2001 @@ -58,7 +58,7 @@ #else static int lance_debug = 1; #endif -MODULE_PARM(lance_debug, "i"); +PARAM(lance_debug, int, 000); MODULE_PARM_DESC(lance_debug, "Lance debug level (0-3)"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/cs89x0.c working-2.4.14-param-all/drivers/net/cs89x0.c --- working-2.4.14-param/drivers/net/cs89x0.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/cs89x0.c Thu Nov 22 08:21:40 2001 @@ -232,21 +232,6 @@ /* Example routines you must write ;->. */ #define tx_done(dev) 1 -/* - * Permit 'cs89x0_dma=N' in the kernel boot environment - */ -#if !defined(MODULE) && (ALLOW_DMA != 0) -static int g_cs89x0_dma; - -static int __init dma_fn(char *str) -{ - g_cs89x0_dma = simple_strtol(str,NULL,0); - return 1; -} - -__setup("cs89x0_dma=", dma_fn); -#endif /* !defined(MODULE) && (ALLOW_DMA != 0) */ - /* Check for a network adaptor of this type, and return '0' iff one exists. If dev->base_addr == 0, probe all likely locations. @@ -1592,21 +1577,21 @@ static int io; static int irq; static int debug; -static char media[8]; +static char *media; static int duplex=-1; static int use_dma; /* These generate unused var warnings if ALLOW_DMA = 0 */ static int dma; static int dmasize=16; /* or 64 */ -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(media, "c8"); -MODULE_PARM(duplex, "i"); -MODULE_PARM(dma , "i"); -MODULE_PARM(dmasize , "i"); -MODULE_PARM(use_dma , "i"); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(debug, int, 000); +PARAM(media, charp, 000); +PARAM(duplex, int, 000); +PARAM(dma, int, 000); +PARAM(dmasize, int, 000); +PARAM(use_dma, int, 000); MODULE_PARM_DESC(io, "cs89x0 I/O base address"); MODULE_PARM_DESC(irq, "cs89x0 IRQ number"); #if DEBUGGING diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/de4x5.c working-2.4.14-param-all/drivers/net/de4x5.c --- working-2.4.14-param/drivers/net/de4x5.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/de4x5.c Thu Nov 22 08:21:40 2001 @@ -1041,9 +1041,9 @@ int (*init)(struct net_device *)); static int count_adapters(void); static int loading_module = 1; -MODULE_PARM(de4x5_debug, "i"); -MODULE_PARM(dec_only, "i"); -MODULE_PARM(args, "s"); +PARAM(de4x5_debug, int, 000); +PARAM(dec_only, int, 000); +PARAM(args, charp, 000); MODULE_PARM_DESC(de4x5_debug, "de4x5 debug mask"); MODULE_PARM_DESC(dec_only, "de4x5 probe only for Digital boards (0-1)"); MODULE_PARM_DESC(args, "de4x5 full duplex and media type settings; see de4x5.c for details"); @@ -5788,7 +5788,7 @@ #define LP(a) ((struct de4x5_private *)(a)) static struct net_device *mdev = NULL; static int io=0x0;/* EDIT THIS LINE FOR YOUR CONFIGURATION IF NEEDED */ -MODULE_PARM(io, "i"); +PARAM(io, int, 000); MODULE_PARM_DESC(io, "de4x5 I/O base address"); int diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/de600.c working-2.4.14-param-all/drivers/net/de600.c --- working-2.4.14-param/drivers/net/de600.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/de600.c Thu Nov 22 08:21:41 2001 @@ -112,11 +112,11 @@ #include static unsigned int de600_debug = DE600_DEBUG; -MODULE_PARM(de600_debug, "i"); +PARAM(de600_debug, int, 000); MODULE_PARM_DESC(de600_debug, "DE-600 debug level (0-2)"); static unsigned int delay_time = 10; -MODULE_PARM(delay_time, "i"); +PARAM(delay_time, int, 000); MODULE_PARM_DESC(delay_time, "DE-600 deley on I/O in microseconds"); #ifdef FAKE_SMALL_MAX diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/de620.c working-2.4.14-param-all/drivers/net/de620.c --- working-2.4.14-param/drivers/net/de620.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/de620.c Thu Nov 22 08:21:41 2001 @@ -191,12 +191,12 @@ static unsigned int de620_debug = DE620_DEBUG; -MODULE_PARM(bnc, "i"); -MODULE_PARM(utp, "i"); -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(clone, "i"); -MODULE_PARM(de620_debug, "i"); +PARAM(bnc, int, 000); +PARAM(utp, int, 000); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(clone, int, 000); +PARAM(de620_debug, int, 000); MODULE_PARM_DESC(bnc, "DE-620 set BNC medium (0-1)"); MODULE_PARM_DESC(utp, "DE-620 set UTP medium (0-1)"); MODULE_PARM_DESC(io, "DE-620 I/O base address,required"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/depca.c working-2.4.14-param-all/drivers/net/depca.c --- working-2.4.14-param/drivers/net/depca.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/depca.c Thu Nov 22 08:21:41 2001 @@ -2037,8 +2037,8 @@ static struct net_device thisDepca; static int irq=7; /* EDIT THESE LINE FOR YOUR CONFIGURATION */ static int io=0x200; /* Or use the irq= io= options to insmod */ -MODULE_PARM(irq, "i"); -MODULE_PARM(io, "i"); +PARAM(irq, int, 000); +PARAM(io, int, 000); MODULE_PARM_DESC(irq, "DEPCA IRQ number"); MODULE_PARM_DESC(io, "DEPCA I/O base address"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/dgrs.c working-2.4.14-param-all/drivers/net/dgrs.c --- working-2.4.14-param/drivers/net/dgrs.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/dgrs.c Thu Nov 22 08:21:41 2001 @@ -1435,14 +1435,14 @@ static __u32 ipxnet = -1; static int nicmode = -1; -MODULE_PARM(debug, "i"); -MODULE_PARM(dma, "i"); -MODULE_PARM(hashexpire, "i"); -MODULE_PARM(spantree, "i"); -MODULE_PARM(ipaddr, "1-4i"); -MODULE_PARM(iptrap, "1-4i"); -MODULE_PARM(ipxnet, "i"); -MODULE_PARM(nicmode, "i"); +PARAM(debug, int, 000); +PARAM(dma, int, 000); +PARAM(hashexpire, int, 000); +PARAM(spantree, int, 000); +PARAM_ARRAY(ipaddr, ipaddr, int, 1, 4, 000); +PARAM_ARRAY(iptrap, iptrap, int, 1, 4, 000); +PARAM(ipxnet, int, 000); +PARAM(nicmode, int, 000); MODULE_PARM_DESC(debug, "Digi RightSwitch enable debugging (0-1)"); MODULE_PARM_DESC(dma, "Digi RightSwitch enable BM DMA (0-1)"); MODULE_PARM_DESC(nicmode, "Digi RightSwitch operating mode (1: switch, 2: multi-NIC)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/dl2k.c working-2.4.14-param-all/drivers/net/dl2k.c --- working-2.4.14-param/drivers/net/dl2k.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/dl2k.c Thu Nov 22 08:21:41 2001 @@ -36,13 +36,13 @@ MODULE_DESCRIPTION ("D-Link DL2000-based Gigabit Ethernet Adapter"); MODULE_LICENSE("GPL"); -MODULE_PARM (mtu, "1-" __MODULE_STRING (MAX_UNITS) "i"); -MODULE_PARM (media, "1-" __MODULE_STRING (MAX_UNITS) "s"); -MODULE_PARM (vlan, "1-" __MODULE_STRING (MAX_UNITS) "i"); -MODULE_PARM (jumbo, "1-" __MODULE_STRING (MAX_UNITS) "i"); -MODULE_PARM (copy_thresh, "i"); -MODULE_PARM (int_count, "i"); -MODULE_PARM (int_timeout, "i"); +PARAM_ARRAY(mtu, mtu, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(media, media, charp, 1, MAX_UNITS, 000); +PARAM_ARRAY(vlan, vlan, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(jumbo, jumbo, int, 1, MAX_UNITS, 000); +PARAM(copy_thresh, int, 000); +PARAM(int_count, int, 000); +PARAM(int_timeout, int, 000); /* Enable the default interrupts */ #define EnableInt() \ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/dmfe.c working-2.4.14-param-all/drivers/net/dmfe.c --- working-2.4.14-param/drivers/net/dmfe.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/dmfe.c Thu Nov 22 08:21:41 2001 @@ -2012,15 +2012,15 @@ MODULE_DESCRIPTION("Davicom DM910X fast ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); -MODULE_PARM(mode, "i"); -MODULE_PARM(cr6set, "i"); -MODULE_PARM(chkmode, "i"); -MODULE_PARM(HPNA_mode, "i"); -MODULE_PARM(HPNA_rx_cmd, "i"); -MODULE_PARM(HPNA_tx_cmd, "i"); -MODULE_PARM(HPNA_NoiseFloor, "i"); -MODULE_PARM(SF_mode, "i"); +PARAM(debug, int, 000); +PARAM(mode, int, 000); +PARAM(cr6set, int, 000); +PARAM(chkmode, int, 000); +PARAM(HPNA_mode, int, 000); +PARAM(HPNA_rx_cmd, int, 000); +PARAM(HPNA_tx_cmd, int, 000); +PARAM(HPNA_NoiseFloor, int, 000); +PARAM(SF_mode, int, 000); MODULE_PARM_DESC(debug, "Davicom DM9xxx enable debugging (0-1)"); MODULE_PARM_DESC(mode, "Davicom DM9xxx: Bit 0: 10/100Mbps, bit 2: duplex, bit 8: HomePNA"); MODULE_PARM_DESC(SF_mode, "Davicom DM9xxx special function (bit 0: VLAN, bit 1 Flow Control, bit 2: TX pause packet)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/e2100.c working-2.4.14-param-all/drivers/net/e2100.c --- working-2.4.14-param/drivers/net/e2100.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/e2100.c Thu Nov 22 08:21:41 2001 @@ -384,10 +384,10 @@ static int mem[MAX_E21_CARDS]; static int xcvr[MAX_E21_CARDS]; /* choose int. or ext. xcvr */ -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_E21_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_E21_CARDS) "i"); -MODULE_PARM(mem, "1-" __MODULE_STRING(MAX_E21_CARDS) "i"); -MODULE_PARM(xcvr, "1-" __MODULE_STRING(MAX_E21_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_E21_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_E21_CARDS, 000); +PARAM_ARRAY(mem, mem, int, 1, MAX_E21_CARDS, 000); +PARAM_ARRAY(xcvr, xcvr, int, 1, MAX_E21_CARDS, 000); MODULE_PARM_DESC(io, "E2100 I/O base address(es)"); MODULE_PARM_DESC(irq, "E2100 IRQ number(s)"); MODULE_PARM_DESC(mem, " E2100 memory base address(es)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/eepro.c working-2.4.14-param-all/drivers/net/eepro.c --- working-2.4.14-param/drivers/net/eepro.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/eepro.c Thu Nov 22 08:21:41 2001 @@ -1769,10 +1769,10 @@ MODULE_DESCRIPTION("Intel i82595 ISA EtherExpressPro10/10+ driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_EEPRO) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_EEPRO) "i"); -MODULE_PARM(mem, "1-" __MODULE_STRING(MAX_EEPRO) "i"); -MODULE_PARM(autodetect, "1-" __MODULE_STRING(1) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_EEPRO, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_EEPRO, 000); +PARAM_ARRAY(mem, mem, int, 1, MAX_EEPRO, 000); +PARAM(autodetect, int, 000); MODULE_PARM_DESC(io, "EtherExpress Pro/10 I/O base addres(es)"); MODULE_PARM_DESC(irq, "EtherExpress Pro/10 IRQ number(s)"); MODULE_PARM_DESC(mem, "EtherExpress Pro/10 Rx buffer size(es) in kB (3-29)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/eepro100.c working-2.4.14-param-all/drivers/net/eepro100.c --- working-2.4.14-param/drivers/net/eepro100.c Mon Oct 1 05:26:08 2001 +++ working-2.4.14-param-all/drivers/net/eepro100.c Thu Nov 22 08:21:41 2001 @@ -117,17 +117,17 @@ MODULE_AUTHOR("Maintainer: Andrey V. Savochkin "); MODULE_DESCRIPTION("Intel i82557/i82558/i82559 PCI EtherExpressPro driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(8) "i"); -MODULE_PARM(congenb, "i"); -MODULE_PARM(txfifo, "i"); -MODULE_PARM(rxfifo, "i"); -MODULE_PARM(txdmacount, "i"); -MODULE_PARM(rxdmacount, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(multicast_filter_limit, "i"); +PARAM(debug, int, 000); +PARAM_ARRAY(options, options, int, 1, 8, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, 8, 000); +PARAM(congenb, int, 000); +PARAM(txfifo, int, 000); +PARAM(rxfifo, int, 000); +PARAM(txdmacount, int, 000); +PARAM(rxdmacount, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM(max_interrupt_work, int, 000); +PARAM(multicast_filter_limit, int, 000); MODULE_PARM_DESC(debug, "eepro100 debug level (0-6)"); MODULE_PARM_DESC(options, "eepro100: Bits 0-3: tranceiver type, bit 4: full duplex, bit 5: 100Mbps"); MODULE_PARM_DESC(full_duplex, "eepro100 full duplex setting(s) (1)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/eexpress.c working-2.4.14-param-all/drivers/net/eexpress.c --- working-2.4.14-param/drivers/net/eexpress.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/eexpress.c Thu Nov 22 08:21:41 2001 @@ -1630,8 +1630,8 @@ static int irq[EEXP_MAX_CARDS]; static int io[EEXP_MAX_CARDS]; -MODULE_PARM(io, "1-" __MODULE_STRING(EEXP_MAX_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(EEXP_MAX_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, EEXP_MAX_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, EEXP_MAX_CARDS, 000); MODULE_PARM_DESC(io, "EtherExpress 16 I/O base address(es)"); MODULE_PARM_DESC(irq, "EtherExpress 16 IRQ number(s)"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/epic100.c working-2.4.14-param-all/drivers/net/epic100.c --- working-2.4.14-param/drivers/net/epic100.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/epic100.c Thu Nov 22 08:21:41 2001 @@ -140,11 +140,11 @@ MODULE_DESCRIPTION("SMC 83c170 EPIC series Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); +PARAM(debug, int, 000); +PARAM(max_interrupt_work, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); MODULE_PARM_DESC(debug, "EPIC/100 debug level (0-5)"); MODULE_PARM_DESC(max_interrupt_work, "EPIC/100 maximum events handled per interrupt"); MODULE_PARM_DESC(options, "EPIC/100: Bits 0-3: media type, bit 4: full duplex"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/es3210.c working-2.4.14-param-all/drivers/net/es3210.c --- working-2.4.14-param/drivers/net/es3210.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/es3210.c Thu Nov 22 08:21:41 2001 @@ -380,9 +380,9 @@ static int irq[MAX_ES_CARDS]; static int mem[MAX_ES_CARDS]; -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_ES_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_ES_CARDS) "i"); -MODULE_PARM(mem, "1-" __MODULE_STRING(MAX_ES_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_ES_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_ES_CARDS, 000); +PARAM_ARRAY(mem, mem, int, 1, MAX_ES_CARDS, 000); MODULE_PARM_DESC(io, "ES3210 I/O base address(es)"); MODULE_PARM_DESC(irq, "ES3210 IRQ number(s)"); MODULE_PARM_DESC(mem, "ES3210 memory base address(es)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/eth16i.c working-2.4.14-param-all/drivers/net/eth16i.c --- working-2.4.14-param/drivers/net/eth16i.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/eth16i.c Thu Nov 22 08:21:41 2001 @@ -1408,18 +1408,18 @@ MODULE_LICENSE("GPL"); -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_ETH16I_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_ETH16I_CARDS, 000); MODULE_PARM_DESC(io, "eth16i I/O base address(es)"); #if 0 -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_ETH16I_CARDS) "i"); +PARAM_ARRAY(irq, irq, int, 1, MAX_ETH16I_CARDS, 000); MODULE_PARM_DESC(irq, "eth16i interrupt request number"); #endif -MODULE_PARM(mediatype, "1-" __MODULE_STRING(MAX_ETH16I_CARDS) "s"); +PARAM_ARRAY(mediatype, mediatype, charp, 1, MAX_ETH16I_CARDS, 000); MODULE_PARM_DESC(mediatype, "eth16i media type of interface(s) (bnc,tp,dix,auto,eprom)"); -MODULE_PARM(debug, "i"); +PARAM(debug, int, 000); MODULE_PARM_DESC(debug, "eth16i debug level (0-6)"); #endif diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ethertap.c working-2.4.14-param-all/drivers/net/ethertap.c --- working-2.4.14-param/drivers/net/ethertap.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/ethertap.c Thu Nov 22 08:21:41 2001 @@ -335,7 +335,7 @@ #ifdef MODULE static int unit; -MODULE_PARM(unit,"i"); +PARAM(unit, int, 000); MODULE_PARM_DESC(unit,"Ethertap device number"); static struct net_device dev_ethertap = diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ewrk3.c working-2.4.14-param-all/drivers/net/ewrk3.c --- working-2.4.14-param/drivers/net/ewrk3.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/ewrk3.c Thu Nov 22 08:21:41 2001 @@ -1849,8 +1849,8 @@ static int io = 0x300; /* <--- EDIT THESE LINES FOR YOUR CONFIGURATION */ static int irq = 5; /* or use the insmod io= irq= options */ -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); +PARAM(io, int, 000); +PARAM(irq, int, 000); MODULE_PARM_DESC(io, "EtherWORKS 3 I/O base address"); MODULE_PARM_DESC(irq, "EtherWORKS 3 IRQ number"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/fealnx.c working-2.4.14-param-all/drivers/net/fealnx.c --- working-2.4.14-param/drivers/net/fealnx.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/fealnx.c Thu Nov 22 08:21:41 2001 @@ -110,13 +110,13 @@ MODULE_AUTHOR("Myson or whoever"); MODULE_DESCRIPTION("Myson MTD-8xx 100/10M Ethernet PCI Adapter Driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(max_interrupt_work, "i"); +PARAM(max_interrupt_work, int, 000); //MODULE_PARM(min_pci_latency, "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(multicast_filter_limit, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); +PARAM(debug, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM(multicast_filter_limit, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); MODULE_PARM_DESC(max_interrupt_work, "fealnx maximum events handled per interrupt"); MODULE_PARM_DESC(debug, "fealnx enable debugging (0-1)"); MODULE_PARM_DESC(rx_copybreak, "fealnx copy breakpoint for copy-only-tiny-frames"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/fmv18x.c working-2.4.14-param-all/drivers/net/fmv18x.c --- working-2.4.14-param/drivers/net/fmv18x.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/fmv18x.c Thu Nov 22 08:21:41 2001 @@ -626,9 +626,9 @@ static int io = 0x220; static int irq; -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(net_debug, "i"); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(net_debug, int, 000); MODULE_PARM_DESC(io, "FMV-18X I/O address"); MODULE_PARM_DESC(irq, "FMV-18X IRQ number"); MODULE_PARM_DESC(net_debug, "FMV-18X debug level (0-1,5-6)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hamachi.c working-2.4.14-param-all/drivers/net/hamachi.c --- working-2.4.14-param/drivers/net/hamachi.c Wed Oct 10 08:13:03 2001 +++ working-2.4.14-param-all/drivers/net/hamachi.c Thu Nov 22 08:21:41 2001 @@ -523,21 +523,21 @@ MODULE_DESCRIPTION("Packet Engines 'Hamachi' GNIC-II Gigabit Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(mtu, "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(min_rx_pkt, "i"); -MODULE_PARM(max_rx_gap, "i"); -MODULE_PARM(max_rx_latency, "i"); -MODULE_PARM(min_tx_pkt, "i"); -MODULE_PARM(max_tx_gap, "i"); -MODULE_PARM(max_tx_latency, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(rx_params, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(tx_params, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(force32, "i"); +PARAM(max_interrupt_work, int, 000); +PARAM(mtu, int, 000); +PARAM(debug, int, 000); +PARAM(min_rx_pkt, int, 000); +PARAM(max_rx_gap, int, 000); +PARAM(max_rx_latency, int, 000); +PARAM(min_tx_pkt, int, 000); +PARAM(max_tx_gap, int, 000); +PARAM(max_tx_latency, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM_ARRAY(rx_params, rx_params, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(tx_params, tx_params, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); +PARAM(force32, int, 000); MODULE_PARM_DESC(max_interrupt_work, "GNIC-II maximum events handled per interrupt"); MODULE_PARM_DESC(mtu, "GNIC-II MTU (all boards)"); MODULE_PARM_DESC(debug, "GNIC-II debug level (0-7)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hamradio/6pack.c working-2.4.14-param-all/drivers/net/hamradio/6pack.c --- working-2.4.14-param/drivers/net/hamradio/6pack.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/hamradio/6pack.c Thu Nov 22 08:21:41 2001 @@ -137,7 +137,7 @@ static sixpack_ctrl_t **sixpack_ctrls; int sixpack_maxdev = SIXP_NRUNIT; /* Can be overridden with insmod! */ -MODULE_PARM(sixpack_maxdev, "i"); +PARAM(sixpack_maxdev, int, 000); MODULE_PARM_DESC(sixpack_maxdev, "number of 6PACK devices"); static void sp_start_tx_timer(struct sixpack *); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hamradio/baycom_epp.c working-2.4.14-param-all/drivers/net/hamradio/baycom_epp.c --- working-2.4.14-param/drivers/net/hamradio/baycom_epp.c Tue Sep 11 02:04:53 2001 +++ working-2.4.14-param-all/drivers/net/hamradio/baycom_epp.c Thu Nov 22 08:21:41 2001 @@ -1404,12 +1404,12 @@ /* * command line settable parameters */ -static const char *mode[NR_PORTS] = { "", }; +static char *mode[NR_PORTS] = { "", }; static int iobase[NR_PORTS] = { 0x378, }; -MODULE_PARM(mode, "1-" __MODULE_STRING(NR_PORTS) "s"); +PARAM_ARRAY(mode, mode, charp, 1, NR_PORTS, 000); MODULE_PARM_DESC(mode, "baycom operating mode"); -MODULE_PARM(iobase, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(iobase, iobase, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(iobase, "baycom io base address"); MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); @@ -1488,33 +1488,3 @@ module_init(init_baycomepp); module_exit(cleanup_baycomepp); - -/* --------------------------------------------------------------------- */ - -#ifndef MODULE - -/* - * format: baycom_epp=io,mode - * mode: fpga config options - */ - -static int __init baycom_epp_setup(char *str) -{ - static unsigned __initdata nr_dev = 0; - int ints[2]; - - if (nr_dev >= NR_PORTS) - return 0; - str = get_options(str, 2, ints); - if (ints[0] < 1) - return 0; - mode[nr_dev] = str; - iobase[nr_dev] = ints[1]; - nr_dev++; - return 1; -} - -__setup("baycom_epp=", baycom_epp_setup); - -#endif /* MODULE */ -/* --------------------------------------------------------------------- */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hamradio/baycom_par.c working-2.4.14-param-all/drivers/net/hamradio/baycom_par.c --- working-2.4.14-param/drivers/net/hamradio/baycom_par.c Wed Aug 15 18:22:15 2001 +++ working-2.4.14-param-all/drivers/net/hamradio/baycom_par.c Thu Nov 22 08:21:41 2001 @@ -483,12 +483,12 @@ /* * command line settable parameters */ -static const char *mode[NR_PORTS] = { "picpar", }; +static char *mode[NR_PORTS] = { "picpar", }; static int iobase[NR_PORTS] = { 0x378, }; -MODULE_PARM(mode, "1-" __MODULE_STRING(NR_PORTS) "s"); +PARAM_ARRAY(mode, mode, charp, 1, NR_PORTS, 000); MODULE_PARM_DESC(mode, "baycom operating mode; eg. par96 or picpar"); -MODULE_PARM(iobase, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(iobase, iobase, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(iobase, "baycom io base address"); MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); @@ -552,33 +552,3 @@ module_init(init_baycompar); module_exit(cleanup_baycompar); - -/* --------------------------------------------------------------------- */ - -#ifndef MODULE - -/* - * format: baycom_par=io,mode - * mode: par96,picpar - */ - -static int __init baycom_par_setup(char *str) -{ - static unsigned nr_dev; - int ints[2]; - - if (nr_dev >= NR_PORTS) - return 0; - str = get_options(str, 2, ints); - if (ints[0] < 1) - return 0; - mode[nr_dev] = str; - iobase[nr_dev] = ints[1]; - nr_dev++; - return 1; -} - -__setup("baycom_par=", baycom_par_setup); - -#endif /* MODULE */ -/* --------------------------------------------------------------------- */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hamradio/baycom_ser_fdx.c working-2.4.14-param-all/drivers/net/hamradio/baycom_ser_fdx.c --- working-2.4.14-param/drivers/net/hamradio/baycom_ser_fdx.c Wed Aug 15 18:22:15 2001 +++ working-2.4.14-param-all/drivers/net/hamradio/baycom_ser_fdx.c Thu Nov 22 08:21:41 2001 @@ -598,13 +598,13 @@ static int irq[NR_PORTS] = { 4, }; static int baud[NR_PORTS] = { [0 ... NR_PORTS-1] = 1200 }; -MODULE_PARM(mode, "1-" __MODULE_STRING(NR_PORTS) "s"); +PARAM_ARRAY(mode, mode, charp, 1, NR_PORTS, 000); MODULE_PARM_DESC(mode, "baycom operating mode; * for software DCD"); -MODULE_PARM(iobase, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(iobase, iobase, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(iobase, "baycom io base address"); -MODULE_PARM(irq, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(irq, irq, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(irq, "baycom irq number"); -MODULE_PARM(baud, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(baud, baud, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(baud, "baycom baud rate (300 to 4800)"); MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); @@ -669,39 +669,3 @@ module_init(init_baycomserfdx); module_exit(cleanup_baycomserfdx); - -/* --------------------------------------------------------------------- */ - -#ifndef MODULE - -/* - * format: baycom_ser_fdx=io,irq,mode - * mode: ser# hardware DCD - * ser#* software DCD - * ser#+ hardware DCD, inverted signal at DCD pin - * '#' denotes the baud rate / 100, eg. ser12* is '1200 baud, soft DCD' - */ - -static int __init baycom_ser_fdx_setup(char *str) -{ - static unsigned nr_dev; - int ints[4]; - - if (nr_dev >= NR_PORTS) - return 0; - str = get_options(str, 4, ints); - if (ints[0] < 2) - return 0; - mode[nr_dev] = str; - iobase[nr_dev] = ints[1]; - irq[nr_dev] = ints[2]; - if (ints[0] >= 3) - baud[nr_dev] = ints[3]; - nr_dev++; - return 1; -} - -__setup("baycom_ser_fdx=", baycom_ser_fdx_setup); - -#endif /* MODULE */ -/* --------------------------------------------------------------------- */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hamradio/baycom_ser_hdx.c working-2.4.14-param-all/drivers/net/hamradio/baycom_ser_hdx.c --- working-2.4.14-param/drivers/net/hamradio/baycom_ser_hdx.c Wed Aug 15 18:22:15 2001 +++ working-2.4.14-param-all/drivers/net/hamradio/baycom_ser_hdx.c Thu Nov 22 08:21:41 2001 @@ -640,11 +640,11 @@ static int iobase[NR_PORTS] = { 0x3f8, }; static int irq[NR_PORTS] = { 4, }; -MODULE_PARM(mode, "1-" __MODULE_STRING(NR_PORTS) "s"); +PARAM_ARRAY(mode, mode, charp, 1, NR_PORTS, 000); MODULE_PARM_DESC(mode, "baycom operating mode; * for software DCD"); -MODULE_PARM(iobase, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(iobase, iobase, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(iobase, "baycom io base address"); -MODULE_PARM(irq, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(irq, irq, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(irq, "baycom irq number"); MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); @@ -708,38 +708,3 @@ module_init(init_baycomserhdx); module_exit(cleanup_baycomserhdx); - -/* --------------------------------------------------------------------- */ - -#ifndef MODULE - -/* - * format: baycom_ser_hdx=io,irq,mode - * mode: ser12 hardware DCD - * ser12* software DCD - * ser12@ hardware/software DCD, i.e. no explicit DCD signal but hardware - * mutes audio input to the modem - * ser12+ hardware DCD, inverted signal at DCD pin - */ - -static int __init baycom_ser_hdx_setup(char *str) -{ - static unsigned nr_dev; - int ints[3]; - - if (nr_dev >= NR_PORTS) - return 0; - str = get_options(str, 3, ints); - if (ints[0] < 2) - return 0; - mode[nr_dev] = str; - iobase[nr_dev] = ints[1]; - irq[nr_dev] = ints[2]; - nr_dev++; - return 1; -} - -__setup("baycom_ser_hdx=", baycom_ser_hdx_setup); - -#endif /* MODULE */ -/* --------------------------------------------------------------------- */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hamradio/dmascc.c working-2.4.14-param-all/drivers/net/hamradio/dmascc.c --- working-2.4.14-param/drivers/net/hamradio/dmascc.c Thu Apr 19 07:40:06 2001 +++ working-2.4.14-param-all/drivers/net/hamradio/dmascc.c Thu Nov 22 08:21:41 2001 @@ -305,7 +305,7 @@ MODULE_AUTHOR("Klaus Kudielka"); MODULE_DESCRIPTION("Driver for high-speed SCC boards"); -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NUM_DEVS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_NUM_DEVS, 000); int init_module(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hamradio/mkiss.c working-2.4.14-param-all/drivers/net/hamradio/mkiss.c --- working-2.4.14-param/drivers/net/hamradio/mkiss.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/hamradio/mkiss.c Thu Nov 22 08:21:41 2001 @@ -1006,7 +1006,7 @@ MODULE_AUTHOR("Hans Albas PE1AYX "); MODULE_DESCRIPTION("KISS driver for AX.25 over TTYs"); -MODULE_PARM(ax25_maxdev, "i"); +PARAM(ax25_maxdev, int, 000); MODULE_PARM_DESC(ax25_maxdev, "number of MKISS devices"); module_init(mkiss_init_driver); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hamradio/soundmodem/sm.c working-2.4.14-param-all/drivers/net/hamradio/soundmodem/sm.c --- working-2.4.14-param/drivers/net/hamradio/soundmodem/sm.c Thu Apr 19 07:40:05 2001 +++ working-2.4.14-param-all/drivers/net/hamradio/soundmodem/sm.c Thu Nov 22 08:21:41 2001 @@ -615,21 +615,21 @@ static int pario[NR_PORTS] = { [0 ... NR_PORTS-1] = 0 }; static int midiio[NR_PORTS] = { [0 ... NR_PORTS-1] = 0 }; -MODULE_PARM(mode, "1-" __MODULE_STRING(NR_PORTS) "s"); +PARAM_ARRAY(mode, mode, charp, 1, NR_PORTS, 000); MODULE_PARM_DESC(mode, "soundmodem operating mode; eg. sbc:afsk1200 or wss:fsk9600"); -MODULE_PARM(iobase, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(iobase, iobase, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(iobase, "soundmodem base address"); -MODULE_PARM(irq, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(irq, irq, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(irq, "soundmodem interrupt"); -MODULE_PARM(dma, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(dma, dma, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(dma, "soundmodem dma channel"); -MODULE_PARM(dma2, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(dma2, dma2, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(dma2, "soundmodem 2nd dma channel; full duplex only"); -MODULE_PARM(serio, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(serio, serio, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(serio, "soundmodem PTT output on serial port"); -MODULE_PARM(pario, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(pario, pario, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(pario, "soundmodem PTT output on parallel port"); -MODULE_PARM(midiio, "1-" __MODULE_STRING(NR_PORTS) "i"); +PARAM_ARRAY(midiio, midiio, int, 1, NR_PORTS, 000); MODULE_PARM_DESC(midiio, "soundmodem PTT output on midi port"); MODULE_AUTHOR("Thomas M. Sailer, sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu"); @@ -714,46 +714,3 @@ module_init(init_soundmodem); module_exit(cleanup_soundmodem); - -/* --------------------------------------------------------------------- */ - -#ifndef MODULE - -/* - * format: soundmodem=io,irq,dma[,dma2[,serio[,pario]]],mode - * mode: hw:modem - * hw: sbc, wss, wssfdx - * modem: afsk1200, fsk9600 - */ - -static int __init sm_setup(char *str) -{ - static unsigned nr_dev; - int ints[8]; - - if (nr_dev >= NR_PORTS) - return 0; - str = get_options(str, 8, ints); - mode[nr_dev] = str; - if (ints[0] >= 1) - iobase[nr_dev] = ints[1]; - if (ints[0] >= 2) - irq[nr_dev] = ints[2]; - if (ints[0] >= 3) - dma[nr_dev] = ints[3]; - if (ints[0] >= 4) - dma2[nr_dev] = ints[4]; - if (ints[0] >= 5) - serio[nr_dev] = ints[5]; - if (ints[0] >= 6) - pario[nr_dev] = ints[6]; - if (ints[0] >= 7) - midiio[nr_dev] = ints[7]; - nr_dev++; - return 1; -} - -__setup("soundmodem=", sm_setup); - -#endif /* MODULE */ -/* --------------------------------------------------------------------- */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hp-plus.c working-2.4.14-param-all/drivers/net/hp-plus.c --- working-2.4.14-param/drivers/net/hp-plus.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/hp-plus.c Thu Nov 22 08:21:41 2001 @@ -406,8 +406,8 @@ static int io[MAX_HPP_CARDS]; static int irq[MAX_HPP_CARDS]; -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_HPP_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_HPP_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_HPP_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_HPP_CARDS, 000); MODULE_PARM_DESC(io, "HP PC-LAN+ I/O port address(es)"); MODULE_PARM_DESC(irq, "HP PC-LAN+ IRQ number(s); ignored if properly detected"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hp.c working-2.4.14-param-all/drivers/net/hp.c --- working-2.4.14-param/drivers/net/hp.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/hp.c Thu Nov 22 08:21:41 2001 @@ -378,8 +378,8 @@ static int io[MAX_HP_CARDS]; static int irq[MAX_HP_CARDS]; -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_HP_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_HP_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_HP_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_HP_CARDS, 000); MODULE_PARM_DESC(io, "HP PC-LAN I/O base address(es)"); MODULE_PARM_DESC(irq, "HP PC-LAN IRQ number(s) (assigned)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/hp100.c working-2.4.14-param-all/drivers/net/hp100.c --- working-2.4.14-param/drivers/net/hp100.c Mon Oct 1 05:26:08 2001 +++ working-2.4.14-param-all/drivers/net/hp100.c Thu Nov 22 08:21:41 2001 @@ -300,9 +300,9 @@ static int hp100_priority_tx = HP100_DEFAULT_PRIORITY_TX; static int hp100_mode = 1; -MODULE_PARM(hp100_rx_ratio, "1i"); -MODULE_PARM(hp100_priority_tx, "1i"); -MODULE_PARM(hp100_mode, "1i"); +PARAM(hp100_rx_ratio, int, 000); +PARAM(hp100_priority_tx, int, 000); +PARAM(hp100_mode, int, 000); /* * prototypes @@ -2889,12 +2889,12 @@ /* Parameters set by insmod */ static int hp100_port[HP100_DEVICES] = { 0, [1 ... (HP100_DEVICES-1)] = -1 }; -MODULE_PARM(hp100_port, "1-" __MODULE_STRING(HP100_DEVICES) "i"); +PARAM_ARRAY(hp100_port, hp100_port, int, 1, HP100_DEVICES, 000); /* Allocate HP100_DEVICES strings of length IFNAMSIZ, one string for each device */ static char hp100_name[HP100_DEVICES][IFNAMSIZ] = { "", "", "", "", "" }; /* Allow insmod to write those HP100_DEVICES strings individually */ -MODULE_PARM(hp100_name, "1-" __MODULE_STRING(HP100_DEVICES) "c" __MODULE_STRING(IFNAMSIZ)); +PARAM_ARRAY(hp100_name, hp100_name, charp, 1, HP100_DEVICES, 000); /* List of devices */ static struct net_device *hp100_devlist[HP100_DEVICES]; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ibmlana.c working-2.4.14-param-all/drivers/net/ibmlana.c --- working-2.4.14-param/drivers/net/ibmlana.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/ibmlana.c Thu Nov 22 08:21:41 2001 @@ -1195,8 +1195,8 @@ static struct IBMLANA_NETDEV moddevs[DEVMAX]; static int irq; static int io; -MODULE_PARM(irq, "i"); -MODULE_PARM(io, "i"); +PARAM(irq, int, 000); +PARAM(io, int, 000); MODULE_PARM_DESC(irq, "IBM LAN/A IRQ number"); MODULE_PARM_DESC(io, "IBM LAN/A I/O base address"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/irda/ali-ircc.c working-2.4.14-param-all/drivers/net/irda/ali-ircc.c --- working-2.4.14-param/drivers/net/irda/ali-ircc.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/irda/ali-ircc.c Thu Nov 22 08:21:41 2001 @@ -2293,11 +2293,11 @@ MODULE_LICENSE("GPL"); -MODULE_PARM(io, "1-4i"); +PARAM_ARRAY(io, io, int, 1, 4, 000); MODULE_PARM_DESC(io, "Base I/O addresses"); -MODULE_PARM(irq, "1-4i"); +PARAM_ARRAY(irq, irq, int, 1, 4, 000); MODULE_PARM_DESC(irq, "IRQ lines"); -MODULE_PARM(dma, "1-4i"); +PARAM_ARRAY(dma, dma, int, 1, 4, 000); MODULE_PARM_DESC(dma, "DMA channels"); int init_module(void) diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/irda/irda-usb.c working-2.4.14-param-all/drivers/net/irda/irda-usb.c --- working-2.4.14-param/drivers/net/irda/irda-usb.c Fri Oct 5 11:41:09 2001 +++ working-2.4.14-param-all/drivers/net/irda/irda-usb.c Thu Nov 22 08:21:41 2001 @@ -1574,7 +1574,7 @@ /* * Module parameters */ -MODULE_PARM(qos_mtt_bits, "i"); +PARAM(qos_mtt_bits, int, 000); MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time"); MODULE_AUTHOR("Roman Weissgaerber , Dag Brattli and Jean Tourrilhes "); MODULE_DESCRIPTION("IrDA-USB Dongle Driver"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/irda/irport.c working-2.4.14-param-all/drivers/net/irda/irport.c --- working-2.4.14-param/drivers/net/irda/irport.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/irda/irport.c Thu Nov 22 08:21:41 2001 @@ -1028,9 +1028,9 @@ } #ifdef MODULE -MODULE_PARM(io, "1-4i"); +PARAM_ARRAY(io, io, int, 1, 4, 000); MODULE_PARM_DESC(io, "Base I/O addresses"); -MODULE_PARM(irq, "1-4i"); +PARAM_ARRAY(irq, irq, int, 1, 4, 000); MODULE_PARM_DESC(irq, "IRQ lines"); MODULE_AUTHOR("Dag Brattli "); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/irda/irtty.c working-2.4.14-param-all/drivers/net/irda/irtty.c --- working-2.4.14-param/drivers/net/irda/irtty.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/irda/irtty.c Thu Nov 22 08:21:41 2001 @@ -1045,16 +1045,16 @@ return &self->stats; } -#ifdef MODULE MODULE_AUTHOR("Dag Brattli "); MODULE_DESCRIPTION("IrDA TTY device driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(qos_mtt_bits, "i"); +PARAM(qos_mtt_bits, int, S_IRUGO); MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time"); +#ifdef MODULE /* * Function init_module (void) * diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/irda/nsc-ircc.c working-2.4.14-param-all/drivers/net/irda/nsc-ircc.c --- working-2.4.14-param/drivers/net/irda/nsc-ircc.c Fri Oct 5 11:41:09 2001 +++ working-2.4.14-param-all/drivers/net/irda/nsc-ircc.c Thu Nov 22 08:21:41 2001 @@ -2045,15 +2045,15 @@ MODULE_LICENSE("GPL"); -MODULE_PARM(qos_mtt_bits, "i"); +PARAM(qos_mtt_bits, int, 000); MODULE_PARM_DESC(qos_mtt_bits, "Minimum Turn Time"); -MODULE_PARM(io, "1-4i"); +PARAM_ARRAY(io, io, int, 1, 4, 000); MODULE_PARM_DESC(io, "Base I/O addresses"); -MODULE_PARM(irq, "1-4i"); +PARAM_ARRAY(irq, irq, int, 1, 4, 000); MODULE_PARM_DESC(irq, "IRQ lines"); -MODULE_PARM(dma, "1-4i"); +PARAM_ARRAY(dma, dma, int, 1, 4, 000); MODULE_PARM_DESC(dma, "DMA channels"); -MODULE_PARM(dongle_id, "i"); +PARAM(dongle_id, int, 000); MODULE_PARM_DESC(dongle_id, "Type-id of used dongle"); int init_module(void) diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/irda/sa1100_ir.c working-2.4.14-param-all/drivers/net/irda/sa1100_ir.c --- working-2.4.14-param/drivers/net/irda/sa1100_ir.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/irda/sa1100_ir.c Thu Nov 22 08:33:59 2001 @@ -1156,8 +1156,8 @@ MODULE_AUTHOR("Russell King "); MODULE_DESCRIPTION("StrongARM SA1100 IrDA driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(power_level, "i"); +PARAM(power_level, int, S_IRUGO); MODULE_PARM_DESC(power_level, "IrDA power level, 1 (low) to 3 (high)"); -MODULE_PARM(tx_lpm, "i"); +PARAM(tx_lpm, bool, S_IRUGO); MODULE_PARM_DESC(tx_lpm, "Enable transmitter low power (1.6us) mode"); EXPORT_NO_SYMBOLS; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/irda/smc-ircc.c working-2.4.14-param-all/drivers/net/irda/smc-ircc.c --- working-2.4.14-param/drivers/net/irda/smc-ircc.c Fri Oct 5 11:41:09 2001 +++ working-2.4.14-param-all/drivers/net/irda/smc-ircc.c Thu Nov 22 08:55:45 2001 @@ -1231,15 +1231,15 @@ MODULE_DESCRIPTION("SMC IrCC controller driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(ircc_dma, "1i"); +PARAM(ircc_dma, int, 000); MODULE_PARM_DESC(ircc_dma, "DMA channel"); -MODULE_PARM(ircc_irq, "1i"); +PARAM(ircc_irq, int, 000); MODULE_PARM_DESC(ircc_irq, "IRQ line"); -MODULE_PARM(ircc_fir, "1-4i"); +PARAM(ircc_fir, int, 000); MODULE_PARM_DESC(ircc_fir, "FIR Base Address"); -MODULE_PARM(ircc_sir, "1-4i"); +PARAM(ircc_sir, int, 000); MODULE_PARM_DESC(ircc_sir, "SIR Base Address"); -MODULE_PARM(ircc_cfg, "1-4i"); +PARAM(ircc_cfg, int, 000); MODULE_PARM_DESC(ircc_cfg, "Configuration register base address"); #endif /* MODULE */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/irda/toshoboe.c working-2.4.14-param-all/drivers/net/irda/toshoboe.c --- working-2.4.14-param/drivers/net/irda/toshoboe.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/irda/toshoboe.c Thu Nov 22 08:21:41 2001 @@ -645,8 +645,8 @@ MODULE_AUTHOR("James McKenzie "); MODULE_LICENSE("GPL"); -MODULE_PARM (max_baud, "i"); -MODULE_PARM_DESC(max_baus, "Maximum baud rate"); +PARAM(max_baud, int, 000); +MODULE_PARM_DESC(max_baud, "Maximum baud rate"); static void toshoboe_remove (struct pci_dev *pci_dev) diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/irda/vlsi_ir.c working-2.4.14-param-all/drivers/net/irda/vlsi_ir.c --- working-2.4.14-param/drivers/net/irda/vlsi_ir.c Fri Oct 5 11:41:09 2001 +++ working-2.4.14-param-all/drivers/net/irda/vlsi_ir.c Thu Nov 22 08:21:41 2001 @@ -69,7 +69,7 @@ /********************************************************/ -MODULE_PARM(clksrc, "i"); +PARAM(clksrc, int, 000); MODULE_PARM_DESC(clksrc, "clock input source selection"); /* clksrc: which clock source to be used @@ -82,7 +82,7 @@ static int clksrc = 0; /* default is 0(auto) */ -MODULE_PARM(ringsize, "1-2i"); +PARAM_ARRAY(ringsize, ringsize, int, 1, 2, 000); MODULE_PARM_DESC(ringsize, "TX, RX ring descriptor size"); /* ringsize: size of the tx and rx descriptor rings @@ -96,7 +96,7 @@ static int ringsize[] = {8,8}; /* default is tx=rx=8 */ -MODULE_PARM(sirpulse, "i"); +PARAM(sirpulse, int, 000); MODULE_PARM_DESC(sirpulse, "SIR pulse width tuning"); /* sirpulse: tuning of the SIR pulse width within IrPHY 1.3 limits @@ -111,7 +111,7 @@ static int sirpulse = 1; /* default is 3/16 bittime */ -MODULE_PARM(qos_mtt_bits, "i"); +PARAM(qos_mtt_bits, int, 000); MODULE_PARM_DESC(qos_mtt_bits, "IrLAP bitfield representing min-turn-time"); /* qos_mtt_bits: encoded min-turn-time value we require the peer device diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/irda/w83977af_ir.c working-2.4.14-param-all/drivers/net/irda/w83977af_ir.c --- working-2.4.14-param/drivers/net/irda/w83977af_ir.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/irda/w83977af_ir.c Thu Nov 22 08:21:41 2001 @@ -1381,11 +1381,11 @@ MODULE_LICENSE("GPL"); -MODULE_PARM(qos_mtt_bits, "i"); +PARAM(qos_mtt_bits, int, 000); MODULE_PARM_DESC(qos_mtt_bits, "Mimimum Turn Time"); -MODULE_PARM(io, "1-4i"); +PARAM_ARRAY(io, io, int, 1, 4, 000); MODULE_PARM_DESC(io, "Base I/O addresses"); -MODULE_PARM(irq, "1-4i"); +PARAM_ARRAY(irq, irq, int, 1, 4, 000); MODULE_PARM_DESC(irq, "IRQ lines"); /* diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/lance.c working-2.4.14-param-all/drivers/net/lance.c --- working-2.4.14-param/drivers/net/lance.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/lance.c Thu Nov 22 08:21:41 2001 @@ -296,10 +296,10 @@ static int dma[MAX_CARDS]; static int irq[MAX_CARDS]; -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_CARDS) "i"); -MODULE_PARM(dma, "1-" __MODULE_STRING(MAX_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_CARDS) "i"); -MODULE_PARM(lance_debug, "i"); +PARAM_ARRAY(io, io, int, 1, MAX_CARDS, 000); +PARAM_ARRAY(dma, dma, int, 1, MAX_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_CARDS, 000); +PARAM(lance_debug, int, 000); MODULE_PARM_DESC(io, "LANCE/PCnet I/O base address(es),required"); MODULE_PARM_DESC(dma, "LANCE/PCnet ISA DMA channel (ignored for some devices)"); MODULE_PARM_DESC(irq, "LANCE/PCnet IRQ number (ignored for some devices)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/lasi_82596.c working-2.4.14-param-all/drivers/net/lasi_82596.c --- working-2.4.14-param/drivers/net/lasi_82596.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/lasi_82596.c Thu Nov 22 08:21:41 2001 @@ -181,7 +181,7 @@ MODULE_AUTHOR("Richard Hirst"); MODULE_DESCRIPTION("i82596 driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(i596_debug, "i"); +PARAM(i596_debug, int, 000); MODULE_PARM_DESC(i596_debug, "lasi_82596 debug mask"); /* Copy frames shorter than rx_copybreak, otherwise pass on up in @@ -1520,7 +1520,7 @@ }; -MODULE_PARM(debug, "i"); +PARAM(debug, int, 000); MODULE_PARM_DESC(debug, "lasi_82596 debug mask"); static int debug = -1; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/lne390.c working-2.4.14-param-all/drivers/net/lne390.c --- working-2.4.14-param/drivers/net/lne390.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/lne390.c Thu Nov 22 08:21:41 2001 @@ -378,9 +378,9 @@ static int irq[MAX_LNE_CARDS]; static int mem[MAX_LNE_CARDS]; -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_LNE_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_LNE_CARDS) "i"); -MODULE_PARM(mem, "1-" __MODULE_STRING(MAX_LNE_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_LNE_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_LNE_CARDS, 000); +PARAM_ARRAY(mem, mem, int, 1, MAX_LNE_CARDS, 000); MODULE_PARM_DESC(io, "LNE390 I/O base address(es)"); MODULE_PARM_DESC(irq, "LNE390 IRQ number(s)"); MODULE_PARM_DESC(mem, "LNE390 memory base address(es)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/lp486e.c working-2.4.14-param-all/drivers/net/lp486e.c --- working-2.4.14-param/drivers/net/lp486e.c Mon Oct 1 05:26:06 2001 +++ working-2.4.14-param-all/drivers/net/lp486e.c Thu Nov 22 08:21:41 2001 @@ -1326,12 +1326,12 @@ MODULE_DESCRIPTION("Intel Panther onboard i82596 driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); +PARAM(debug, int, 000); //MODULE_PARM(max_interrupt_work, "i"); //MODULE_PARM(reverse_probe, "i"); //MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); static struct net_device dev_lp486e; static int full_duplex; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/mac89x0.c working-2.4.14-param-all/drivers/net/mac89x0.c --- working-2.4.14-param/drivers/net/mac89x0.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/mac89x0.c Thu Nov 22 08:21:41 2001 @@ -625,7 +625,7 @@ static struct net_device dev_cs89x0; static int debug; -MODULE_PARM(debug, "i"); +PARAM(debug, int, 000); MODULE_PARM_DESC(debug, "CS89[02]0 debug level (0-5)"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/mace.c working-2.4.14-param-all/drivers/net/mace.c --- working-2.4.14-param/drivers/net/mace.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/mace.c Thu Nov 22 08:21:41 2001 @@ -24,7 +24,7 @@ static struct net_device *mace_devs; static int port_aaui = -1; -MODULE_PARM(port_aaui, "i"); +PARAM(port_aaui, int, 000); MODULE_PARM_DESC(port_aaui, "MACE uses AAUI port (0-1)"); #define N_RX_RING 8 diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/macsonic.c working-2.4.14-param-all/drivers/net/macsonic.c --- working-2.4.14-param/drivers/net/macsonic.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/macsonic.c Thu Nov 22 08:21:41 2001 @@ -582,7 +582,7 @@ static char namespace[16] = ""; static struct net_device dev_macsonic; -MODULE_PARM(sonic_debug, "i"); +PARAM(sonic_debug, int, 000); MODULE_PARM_DESC(sonic_debug, "macsonic debug level (1-4)"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/natsemi.c working-2.4.14-param-all/drivers/net/natsemi.c --- working-2.4.14-param/drivers/net/natsemi.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/natsemi.c Thu Nov 22 08:21:41 2001 @@ -206,12 +206,12 @@ MODULE_DESCRIPTION("National Semiconductor DP8381x series PCI Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(mtu, "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); +PARAM(max_interrupt_work, int, 000); +PARAM(mtu, int, 000); +PARAM(debug, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); MODULE_PARM_DESC(max_interrupt_work, "DP8381x maximum events handled per interrupt"); MODULE_PARM_DESC(mtu, "DP8381x MTU (all boards)"); MODULE_PARM_DESC(debug, "DP8381x debug level (0-5)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ne.c working-2.4.14-param-all/drivers/net/ne.c --- working-2.4.14-param/drivers/net/ne.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/ne.c Thu Nov 22 08:21:41 2001 @@ -731,9 +731,9 @@ static int irq[MAX_NE_CARDS]; static int bad[MAX_NE_CARDS]; /* 0xbad = bad sig or no reset ack */ -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NE_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_NE_CARDS) "i"); -MODULE_PARM(bad, "1-" __MODULE_STRING(MAX_NE_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_NE_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_NE_CARDS, 000); +PARAM_ARRAY(bad, bad, int, 1, MAX_NE_CARDS, 000); MODULE_PARM_DESC(io, "NEx000 I/O base address(es),required"); MODULE_PARM_DESC(irq, "NEx000 IRQ number(s)"); MODULE_PARM_DESC(bad, "NEx000 accept bad clone(s)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ne2.c working-2.4.14-param-all/drivers/net/ne2.c --- working-2.4.14-param/drivers/net/ne2.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/ne2.c Thu Nov 22 08:21:41 2001 @@ -747,9 +747,9 @@ MODULE_LICENSE("GPL"); #ifdef MODULE_PARM -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NE_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_NE_CARDS) "i"); -MODULE_PARM(bad, "1-" __MODULE_STRING(MAX_NE_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_NE_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_NE_CARDS, 000); +PARAM_ARRAY(bad, bad, int, 1, MAX_NE_CARDS, 000); MODULE_PARM_DESC(io, "(ignored)"); MODULE_PARM_DESC(irq, "(ignored)"); MODULE_PARM_DESC(bad, "(ignored)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ne2k-pci.c working-2.4.14-param-all/drivers/net/ne2k-pci.c --- working-2.4.14-param/drivers/net/ne2k-pci.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/ne2k-pci.c Thu Nov 22 08:21:41 2001 @@ -79,9 +79,9 @@ MODULE_DESCRIPTION("PCI NE2000 clone driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(debug, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); +PARAM(debug, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); MODULE_PARM_DESC(debug, "PCI NE2000 debug level (1-2)"); MODULE_PARM_DESC(options, "PCI NE2000: Bit 5: full duplex"); MODULE_PARM_DESC(full_duplex, "PCI NE2000 full duplex setting(s) (1)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ne3210.c working-2.4.14-param-all/drivers/net/ne3210.c --- working-2.4.14-param/drivers/net/ne3210.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/ne3210.c Thu Nov 22 08:21:41 2001 @@ -367,9 +367,9 @@ static int irq[MAX_NE3210_CARDS]; static int mem[MAX_NE3210_CARDS]; -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_NE3210_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_NE3210_CARDS) "i"); -MODULE_PARM(mem, "1-" __MODULE_STRING(MAX_NE3210_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_NE3210_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_NE3210_CARDS, 000); +PARAM_ARRAY(mem, mem, int, 1, MAX_NE3210_CARDS, 000); MODULE_PARM_DESC(io, "NE3210 I/O base address(es)"); MODULE_PARM_DESC(irq, "NE3210 IRQ number(s)"); MODULE_PARM_DESC(mem, "NE3210 memory base address(es)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ni5010.c working-2.4.14-param-all/drivers/net/ni5010.c --- working-2.4.14-param/drivers/net/ni5010.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/ni5010.c Thu Nov 22 08:21:41 2001 @@ -736,8 +736,8 @@ static int io; static int irq; -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); +PARAM(io, int, 000); +PARAM(irq, int, 000); MODULE_PARM_DESC(io, "ni5010 I/O base address"); MODULE_PARM_DESC(irq, "ni5010 IRQ number"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ni52.c working-2.4.14-param-all/drivers/net/ni52.c --- working-2.4.14-param/drivers/net/ni52.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/ni52.c Thu Nov 22 08:21:41 2001 @@ -1292,10 +1292,10 @@ static long memstart; /* e.g 0xd0000 */ static long memend; /* e.g 0xd4000 */ -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(memstart, "l"); -MODULE_PARM(memend, "l"); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(memstart, long, 000); +PARAM(memend, long, 000); MODULE_PARM_DESC(io, "NI5210 I/O base address,required"); MODULE_PARM_DESC(irq, "NI5210 IRQ number,required"); MODULE_PARM_DESC(memstart, "NI5210 memory base address,required"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ni65.c working-2.4.14-param-all/drivers/net/ni65.c --- working-2.4.14-param/drivers/net/ni65.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/ni65.c Thu Nov 22 08:21:41 2001 @@ -1181,9 +1181,9 @@ static int io; static int dma; -MODULE_PARM(irq, "i"); -MODULE_PARM(io, "i"); -MODULE_PARM(dma, "i"); +PARAM(irq, int, 000); +PARAM(io, int, 000); +PARAM(dma, int, 000); MODULE_PARM_DESC(irq, "ni6510 IRQ number (ignored for some cards)"); MODULE_PARM_DESC(io, "ni6510 I/O base address"); MODULE_PARM_DESC(dma, "ni6510 ISA DMA channel (ignored for some cards)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pci-skeleton.c working-2.4.14-param-all/drivers/net/pci-skeleton.c --- working-2.4.14-param/drivers/net/pci-skeleton.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/pci-skeleton.c Thu Nov 22 08:21:41 2001 @@ -485,10 +485,10 @@ MODULE_AUTHOR ("Jeff Garzik "); MODULE_DESCRIPTION ("Skeleton for a PCI Fast Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM (multicast_filter_limit, "i"); -MODULE_PARM (max_interrupt_work, "i"); -MODULE_PARM (debug, "i"); -MODULE_PARM (media, "1-" __MODULE_STRING(8) "i"); +PARAM(multicast_filter_limit, int, 000); +PARAM(max_interrupt_work, int, 000); +PARAM(debug, int, 000); +PARAM_ARRAY(media, media, int, 1, 8, 000); MODULE_PARM_DESC (multicast_filter_limit, "pci-skeleton maximum number of filtered multicast addresses"); MODULE_PARM_DESC (max_interrupt_work, "pci-skeleton maximum events handled per interrupt"); MODULE_PARM_DESC (media, "pci-skeleton: Bits 0-3: media type, bit 17: full duplex"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/3c574_cs.c working-2.4.14-param-all/drivers/net/pcmcia/3c574_cs.c --- working-2.4.14-param/drivers/net/pcmcia/3c574_cs.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/3c574_cs.c Thu Nov 22 08:21:41 2001 @@ -100,12 +100,6 @@ #include #include -/* A few values that may be tweaked. */ -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(full_duplex, "i"); - /* Now-standard PC card module parameters. */ static u_int irq_mask = 0xdeb8; /* IRQ3,4,5,7,9,10,11,12,14,15 */ static int irq_list[4] = { -1 }; @@ -119,6 +113,12 @@ /* Force full duplex modes? */ static int full_duplex; +/* A few values that may be tweaked. */ +PARAM(irq_mask, int, 000); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); +PARAM(max_interrupt_work, int, 000); +PARAM(full_duplex, int, 000); + /* To minimize the size of the driver source and make the driver more readable not all constants are symbolically defined. You'll need the manual if you want to understand driver details anyway. */ @@ -214,7 +214,7 @@ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static char *version = "3c574_cs.c 1.000 1998/1/8 Donald Becker, becker@scyld.com.\n"; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/3c589_cs.c working-2.4.14-param-all/drivers/net/pcmcia/3c589_cs.c --- working-2.4.14-param/drivers/net/pcmcia/3c589_cs.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/3c589_cs.c Thu Nov 22 08:21:41 2001 @@ -114,7 +114,7 @@ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static char *version = "3c589_cs.c 1.156 2001/02/07 00:19:41 (David Hinds)"; @@ -133,9 +133,9 @@ static u_int irq_mask = 0xdeb8; static int irq_list[4] = { -1 }; -MODULE_PARM(if_port, "i"); -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +PARAM(if_port, int, 000); +PARAM(irq_mask, int, 000); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); /*====================================================================*/ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/aironet4500_cs.c working-2.4.14-param-all/drivers/net/pcmcia/aironet4500_cs.c --- working-2.4.14-param/drivers/net/pcmcia/aironet4500_cs.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/aironet4500_cs.c Thu Nov 22 08:21:41 2001 @@ -54,7 +54,7 @@ static u_int irq_mask = 0x5eF8; static int awc_ports[] = {0x140,0x100,0xc0, 0x80 }; #if LINUX_VERSION_CODE > 0x20100 -MODULE_PARM(irq_mask, "i"); +PARAM(irq_mask, int, 000); #endif @@ -63,7 +63,7 @@ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); #define PC_DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static char *version = "aironet4500_cs.c v0.1 1/1/99 Elmer Joandi, elmer@ylenurme.ee.\n"; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/com20020_cs.c working-2.4.14-param-all/drivers/net/pcmcia/com20020_cs.c --- working-2.4.14-param/drivers/net/pcmcia/com20020_cs.c Thu Apr 19 07:40:05 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/com20020_cs.c Thu Nov 22 08:21:41 2001 @@ -58,7 +58,7 @@ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static void regdump(struct net_device *dev) @@ -110,18 +110,18 @@ static int clockp; static int clockm; -MODULE_PARM(node, "i"); -MODULE_PARM(timeout, "i"); -MODULE_PARM(backplane, "i"); -MODULE_PARM(clockp, "i"); -MODULE_PARM(clockm, "i"); +PARAM(node, int, 000); +PARAM(timeout, int, 000); +PARAM(backplane, int, 000); +PARAM(clockp, int, 000); +PARAM(clockm, int, 000); /* Bit map of interrupts to choose from */ static u_int irq_mask = 0xdeb8; static int irq_list[4] = { -1 }; -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +PARAM(irq_mask, int, 000); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); /*====================================================================*/ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/fmvj18x_cs.c working-2.4.14-param-all/drivers/net/pcmcia/fmvj18x_cs.c --- working-2.4.14-param/drivers/net/pcmcia/fmvj18x_cs.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/fmvj18x_cs.c Thu Nov 22 08:21:41 2001 @@ -63,7 +63,7 @@ */ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) #else #define DEBUG(n, args...) @@ -78,9 +78,9 @@ /* 0:4KB*2 TX buffer else:8KB*2 TX buffer */ static int sram_config; -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); -MODULE_PARM(sram_config, "i"); +PARAM(irq_mask, int, 000); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); +PARAM(sram_config, int, 000); /*====================================================================*/ /* diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/ibmtr_cs.c working-2.4.14-param-all/drivers/net/pcmcia/ibmtr_cs.c --- working-2.4.14-param/drivers/net/pcmcia/ibmtr_cs.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/ibmtr_cs.c Thu Nov 22 08:21:41 2001 @@ -71,7 +71,7 @@ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static char *version = "ibmtr_cs.c 1.10 1996/01/06 05:19:00 (Steve Kipisz)\n" @@ -101,12 +101,12 @@ /* Ringspeed 4,16 */ static int ringspeed = 16; -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); -MODULE_PARM(mmiobase, "i"); -MODULE_PARM(srambase, "i"); -MODULE_PARM(sramsize, "i"); -MODULE_PARM(ringspeed, "i"); +PARAM(irq_mask, int, 000); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); +PARAM(mmiobase, int, 000); +PARAM(srambase, int, 000); +PARAM(sramsize, int, 000); +PARAM(ringspeed, int, 000); MODULE_LICENSE("GPL"); /*====================================================================*/ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/netwave_cs.c working-2.4.14-param-all/drivers/net/pcmcia/netwave_cs.c --- working-2.4.14-param/drivers/net/pcmcia/netwave_cs.c Sat Oct 13 07:21:18 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/netwave_cs.c Thu Nov 22 08:21:41 2001 @@ -160,7 +160,7 @@ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static char *version = "netwave_cs.c 0.3.0 Thu Jul 17 14:36:02 1997 (John Markus Bjørndalen)\n"; @@ -194,11 +194,11 @@ static u_int irq_mask = 0xdeb8; static int irq_list[4] = { -1 }; -MODULE_PARM(domain, "i"); -MODULE_PARM(scramble_key, "i"); -MODULE_PARM(mem_speed, "i"); -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +PARAM(domain, int, 000); +PARAM(scramble_key, int, 000); +PARAM(mem_speed, int, 000); +PARAM(irq_mask, int, 000); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); /*====================================================================*/ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/nmclan_cs.c working-2.4.14-param-all/drivers/net/pcmcia/nmclan_cs.c --- working-2.4.14-param/drivers/net/pcmcia/nmclan_cs.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/nmclan_cs.c Thu Nov 22 08:21:41 2001 @@ -387,7 +387,7 @@ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) #else #define DEBUG(n, args...) @@ -406,9 +406,9 @@ static u_int irq_mask = 0xdeb8; static int irq_list[4] = { -1 }; -MODULE_PARM(if_port, "i"); -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +PARAM(if_port, int, 000); +PARAM(irq_mask, int, 000); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/pcnet_cs.c working-2.4.14-param-all/drivers/net/pcmcia/pcnet_cs.c --- working-2.4.14-param/drivers/net/pcmcia/pcnet_cs.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/pcnet_cs.c Thu Nov 22 08:34:15 2001 @@ -69,7 +69,7 @@ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) static char *version = "pcnet_cs.c 1.132 2001/02/09 03:13:29 (David Hinds)"; @@ -81,12 +81,12 @@ /* Parameters that can be set with 'insmod' */ -#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i") +#define INT_MODULE_PARM(n, v) static int n = v; PARAM(n, int, 000) /* Bit map of interrupts to choose from */ INT_MODULE_PARM(irq_mask, 0xdeb8); static int irq_list[4] = { -1 }; -MODULE_PARM(irq_list, "1-4i"); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); INT_MODULE_PARM(if_port, 1); /* Transceiver type */ INT_MODULE_PARM(use_big_buf, 1); /* use 64K packet buffer? */ @@ -97,7 +97,7 @@ /* Ugh! Let the user hardwire the hardware address for queer cards */ static int hw_addr[6] = { 0, /* ... */ }; -MODULE_PARM(hw_addr, "6i"); +PARAM_ARRAY(hw_addr, hw_addr, int, 6, 6, 000); /*====================================================================*/ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/ray_cs.c working-2.4.14-param-all/drivers/net/pcmcia/ray_cs.c --- working-2.4.14-param/drivers/net/pcmcia/ray_cs.c Sat Oct 13 07:21:18 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/ray_cs.c Thu Nov 22 08:21:41 2001 @@ -84,7 +84,7 @@ #ifdef PCMCIA_DEBUG static int ray_debug; static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); /* #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); */ #define DEBUG(n, args...) if (pc_debug>(n)) printk(args); #else @@ -223,18 +223,18 @@ MODULE_DESCRIPTION("Raylink/WebGear wireless LAN driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(irq_mask,"i"); -MODULE_PARM(net_type,"i"); -MODULE_PARM(hop_dwell,"i"); -MODULE_PARM(beacon_period,"i"); -MODULE_PARM(psm,"i"); -MODULE_PARM(essid,"s"); -MODULE_PARM(translate,"i"); -MODULE_PARM(country,"i"); -MODULE_PARM(sniffer,"i"); -MODULE_PARM(bc,"i"); -MODULE_PARM(phy_addr,"s"); -MODULE_PARM(ray_mem_speed, "i"); +PARAM(irq_mask, int, 000); +PARAM(net_type, int, 000); +PARAM(hop_dwell, int, 000); +PARAM(beacon_period, int, 000); +PARAM(psm, int, 000); +PARAM(essid, charp, 000); +PARAM(translate, int, 000); +PARAM(country, int, 000); +PARAM(sniffer, int, 000); +PARAM(bc, int, 000); +PARAM(phy_addr, charp, 000); +PARAM(ray_mem_speed, int, 000); static UCHAR b5_default_startup_parms[] = { 0, 0, /* Adhoc station */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/smc91c92_cs.c working-2.4.14-param-all/drivers/net/pcmcia/smc91c92_cs.c --- working-2.4.14-param/drivers/net/pcmcia/smc91c92_cs.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/smc91c92_cs.c Thu Nov 22 08:21:41 2001 @@ -58,7 +58,7 @@ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); static const char *version = "smc91c92_cs.c 0.09 1996/8/4 Donald Becker, becker@scyld.com.\n"; #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) @@ -82,9 +82,9 @@ static u_int irq_mask = 0xdeb8; static int irq_list[4] = { -1 }; -MODULE_PARM(if_port, "i"); -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +PARAM(if_port, int, 000); +PARAM(irq_mask, int, 000); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); MODULE_LICENSE("GPL"); /* Operational parameter that usually are not changed. */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/wavelan_cs.h working-2.4.14-param-all/drivers/net/pcmcia/wavelan_cs.h --- working-2.4.14-param/drivers/net/pcmcia/wavelan_cs.h Sat Oct 13 07:21:18 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/wavelan_cs.h Thu Nov 22 08:21:41 2001 @@ -763,15 +763,15 @@ /* Shared memory speed, in ns */ static int mem_speed; -/* New module interface */ -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); -MODULE_PARM(mem_speed, "i"); +/* New param interface */ +PARAM(irq_mask, int, S_IRUGO); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, S_IRUGO); +PARAM(mem_speed, int, S_IRUGO); #ifdef WAVELAN_ROAMING /* Conditional compile, see above in options */ /* Enable roaming mode ? No ! Please keep this to 0 */ static int do_roaming; -MODULE_PARM(do_roaming, "i"); +PARAM(do_roaming, int, S_IRUGO); #endif /* WAVELAN_ROAMING */ #endif /* WAVELAN_CS_H */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/xirc2ps_cs.c working-2.4.14-param-all/drivers/net/pcmcia/xirc2ps_cs.c --- working-2.4.14-param/drivers/net/pcmcia/xirc2ps_cs.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/xirc2ps_cs.c Thu Nov 22 08:21:42 2001 @@ -214,7 +214,7 @@ */ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); #define DEBUG(n, args...) if (pc_debug>(n)) printk(KDBG_XIRC args) #else #define DEBUG(n, args...) @@ -246,12 +246,12 @@ #define XIR_CBE 14 /* (prodid 1) cardbus ethernet: not supported */ /*====================================================================*/ -/* Parameters that can be set with 'insmod' */ +/* Parameters that can be set with modprobe or boot cmdline */ -#define INT_MODULE_PARM(n, v) static int n = v; MODULE_PARM(n, "i") +#define INT_MODULE_PARM(n, v) static int n = v; PARAM(n, int, S_IRUGO) static int irq_list[4] = { -1 }; -MODULE_PARM(irq_list, "1-4i"); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); INT_MODULE_PARM(irq_mask, 0xdeb8); INT_MODULE_PARM(if_port, 0); INT_MODULE_PARM(full_duplex, 0); @@ -2062,32 +2062,4 @@ module_init(init_xirc2ps_cs); module_exit(exit_xirc2ps_cs); - -#ifndef MODULE -static int __init setup_xirc2ps_cs(char *str) -{ - /* irq, irq_mask, if_port, full_duplex, do_sound, lockup_hack - * [,irq2 [,irq3 [,irq4]]] - */ - int ints[10] = { -1 }; - - str = get_options(str, 9, ints); - -#define MAYBE_SET(X,Y) if (ints[0] >= Y && ints[Y] != -1) { X = ints[Y]; } - MAYBE_SET(irq_list[0], 1); - MAYBE_SET(irq_mask, 2); - MAYBE_SET(if_port, 3); - MAYBE_SET(full_duplex, 4); - MAYBE_SET(do_sound, 5); - MAYBE_SET(lockup_hack, 6); - MAYBE_SET(irq_list[1], 7); - MAYBE_SET(irq_list[2], 8); - MAYBE_SET(irq_list[3], 9); -#undef MAYBE_SET(X,Y) - - return 0; -} - -__setup("xirc2ps_cs=", setup_xirc2ps_cs); -#endif MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcmcia/xircom_tulip_cb.c working-2.4.14-param-all/drivers/net/pcmcia/xircom_tulip_cb.c --- working-2.4.14-param/drivers/net/pcmcia/xircom_tulip_cb.c Tue Nov 6 11:41:34 2001 +++ working-2.4.14-param-all/drivers/net/pcmcia/xircom_tulip_cb.c Thu Nov 22 08:21:42 2001 @@ -116,12 +116,12 @@ MODULE_DESCRIPTION("Xircom CBE-100 ethernet driver"); MODULE_LICENSE("GPL v2"); -MODULE_PARM(debug, "i"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(csr0, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); +PARAM(debug, int, 000); +PARAM(max_interrupt_work, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM(csr0, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); #define RUN_AT(x) (jiffies + (x)) diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/pcnet32.c working-2.4.14-param-all/drivers/net/pcnet32.c --- working-2.4.14-param/drivers/net/pcnet32.c Sat Oct 20 01:32:28 2001 +++ working-2.4.14-param-all/drivers/net/pcnet32.c Thu Nov 22 08:21:42 2001 @@ -68,8 +68,8 @@ static struct net_device *pcnet32_dev; -static const int max_interrupt_work = 80; -static const int rx_copybreak = 200; +static int max_interrupt_work = 80; +static int rx_copybreak = 200; #define PORT_AUI 0x00 #define PORT_10BT 0x01 @@ -1536,19 +1536,19 @@ id_table: pcnet32_pci_tbl, }; -MODULE_PARM(debug, "i"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(tx_start_pt, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_AUTHOR("Thomas Bogendoerfer"); -MODULE_DESCRIPTION("Driver for PCnet32 and PCnetPCI based ethercards"); -MODULE_LICENSE("GPL"); - /* An additional parameter that may be passed in... */ static int debug = -1; static int tx_start_pt = -1; + +PARAM(debug, int, 000); +PARAM(max_interrupt_work, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM(tx_start_pt, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); +MODULE_AUTHOR("Thomas Bogendoerfer"); +MODULE_DESCRIPTION("Driver for PCnet32 and PCnetPCI based ethercards"); +MODULE_LICENSE("GPL"); static int __init pcnet32_init_module(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/plip.c working-2.4.14-param-all/drivers/net/plip.c --- working-2.4.14-param/drivers/net/plip.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/plip.c Thu Nov 22 08:21:42 2001 @@ -1295,8 +1295,8 @@ static int parport[PLIP_MAX] = { [0 ... PLIP_MAX-1] = -1 }; static int timid; -MODULE_PARM(parport, "1-" __MODULE_STRING(PLIP_MAX) "i"); -MODULE_PARM(timid, "1i"); +PARAM_ARRAY(parport, parport, int, 1, PLIP_MAX, 000); +PARAM(timid, int, 000); MODULE_PARM_DESC(parport, "List of parport device numbers to use by plip"); static struct net_device *dev_plip[PLIP_MAX] = { NULL, }; @@ -1375,42 +1375,6 @@ } } } - -#ifndef MODULE - -static int parport_ptr; - -static int __init plip_setup(char *str) -{ - int ints[4]; - - str = get_options(str, ARRAY_SIZE(ints), ints); - - /* Ugh. */ - if (!strncmp(str, "parport", 7)) { - int n = simple_strtoul(str+7, NULL, 10); - if (parport_ptr < PLIP_MAX) - parport[parport_ptr++] = n; - else - printk(KERN_INFO "plip: too many ports, %s ignored.\n", - str); - } else if (!strcmp(str, "timid")) { - timid = 1; - } else { - if (ints[0] == 0 || ints[1] == 0) { - /* disable driver on "plip=" or "plip=0" */ - parport[0] = -2; - } else { - printk(KERN_WARNING "warning: 'plip=0x%x' ignored\n", - ints[1]); - } - } - return 1; -} - -__setup("plip=", plip_setup); - -#endif /* !MODULE */ static int __init plip_init (void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/ppp_async.c working-2.4.14-param-all/drivers/net/ppp_async.c --- working-2.4.14-param/drivers/net/ppp_async.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/ppp_async.c Thu Nov 22 08:21:42 2001 @@ -79,7 +79,7 @@ #define SC_RCV_BITS (SC_RCV_B7_1|SC_RCV_B7_0|SC_RCV_ODDP|SC_RCV_EVNP) static int flag_time = HZ; -MODULE_PARM(flag_time, "i"); +PARAM(flag_time, int, S_IRUGO|S_IWUSR); MODULE_PARM_DESC(flag_time, "ppp_async: interval between flagged packets (in clock ticks)"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/sb1000.c working-2.4.14-param-all/drivers/net/sb1000.c --- working-2.4.14-param/drivers/net/sb1000.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/sb1000.c Thu Nov 22 08:21:42 2001 @@ -1211,8 +1211,8 @@ MODULE_DESCRIPTION("General Instruments SB1000 driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(io, "1-2i"); -MODULE_PARM(irq, "i"); +PARAM_ARRAY(io, io, int, 1, 2, 000); +PARAM(irq, int, 000); MODULE_PARM_DESC(io, "SB1000 I/O base addresses"); MODULE_PARM_DESC(irq, "SB1000 IRQ number"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/seeq8005.c working-2.4.14-param-all/drivers/net/seeq8005.c --- working-2.4.14-param/drivers/net/seeq8005.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/seeq8005.c Thu Nov 22 08:21:42 2001 @@ -712,8 +712,8 @@ static int io = 0x320; static int irq = 10; MODULE_LICENSE("GPL"); -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); +PARAM(io, int, 000); +PARAM(irq, int, 000); MODULE_PARM_DESC(io, "SEEQ 8005 I/O base address"); MODULE_PARM_DESC(irq, "SEEQ 8005 IRQ number"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/shaper.c working-2.4.14-param-all/drivers/net/shaper.c --- working-2.4.14-param/drivers/net/shaper.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/shaper.c Thu Nov 22 08:21:42 2001 @@ -679,22 +679,8 @@ } static int shapers = 1; -#ifdef MODULE - -MODULE_PARM(shapers, "i"); +PARAM(shapers, int, 000); MODULE_PARM_DESC(shapers, "Traffic shaper: maximum nuber of shapers"); - -#else /* MODULE */ - -static int __init set_num_shapers(char *str) -{ - shapers = simple_strtol(str, NULL, 0); - return 1; -} - -__setup("shapers=", set_num_shapers); - -#endif /* MODULE */ static struct net_device *devs; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/sis900.c working-2.4.14-param-all/drivers/net/sis900.c --- working-2.4.14-param/drivers/net/sis900.c Wed Oct 10 08:13:03 2001 +++ working-2.4.14-param-all/drivers/net/sis900.c Thu Nov 22 08:21:42 2001 @@ -164,9 +164,9 @@ MODULE_DESCRIPTION("SiS 900 PCI Fast Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(multicast_filter_limit, "i"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(debug, "i"); +PARAM(multicast_filter_limit, int, 000); +PARAM(max_interrupt_work, int, 000); +PARAM(debug, int, 000); MODULE_PARM_DESC(multicast_filter_limit, "SiS 900/7016 maximum number of filtered multicast addresses"); MODULE_PARM_DESC(max_interrupt_work, "SiS 900/7016 maximum events handled per interrupt"); MODULE_PARM_DESC(debug, "SiS 900/7016 debug level (2-4)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/sk98lin/skge.c working-2.4.14-param-all/drivers/net/sk98lin/skge.c --- working-2.4.14-param/drivers/net/sk98lin/skge.c Sat Oct 13 08:35:53 2001 +++ working-2.4.14-param-all/drivers/net/sk98lin/skge.c Thu Nov 22 08:21:42 2001 @@ -597,19 +597,6 @@ MODULE_AUTHOR("Christoph Goos "); MODULE_DESCRIPTION("SysKonnect SK-NET Gigabit Ethernet SK-98xx driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(AutoNeg_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(AutoNeg_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(DupCap_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(DupCap_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(FlowCtrl_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(FlowCtrl_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(Role_A, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(Role_B, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(PrefPort, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -MODULE_PARM(RlmtMode, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "s"); -/* not used, just there because every driver should have them: */ -MODULE_PARM(options, "1-" __MODULE_STRING(SK_MAX_CARD_PARAM) "i"); -MODULE_PARM(debug, "i"); #ifdef AUTO_NEG_A @@ -676,6 +663,19 @@ static int debug = 0; /* not used */ static int options[SK_MAX_CARD_PARAM] = {0, }; /* not used */ +PARAM_ARRAY(AutoNeg_A, AutoNeg_A, charp, 1, SK_MAX_CARD_PARAM, 000); +PARAM_ARRAY(AutoNeg_B, AutoNeg_B, charp, 1, SK_MAX_CARD_PARAM, 000); +PARAM_ARRAY(DupCap_A, DupCap_A, charp, 1, SK_MAX_CARD_PARAM, 000); +PARAM_ARRAY(DupCap_B, DupCap_B, charp, 1, SK_MAX_CARD_PARAM, 000); +PARAM_ARRAY(FlowCtrl_A, FlowCtrl_A, charp, 1, SK_MAX_CARD_PARAM, 000); +PARAM_ARRAY(FlowCtrl_B, FlowCtrl_B, charp, 1, SK_MAX_CARD_PARAM, 000); +PARAM_ARRAY(Role_A, Role_A, charp, 1, SK_MAX_CARD_PARAM, 000); +PARAM_ARRAY(Role_B, Role_A, charp, 1, SK_MAX_CARD_PARAM, 000); +PARAM_ARRAY(PrefPort, PrefPort, charp, 1, SK_MAX_CARD_PARAM, 000); +PARAM_ARRAY(RlmtMode, RlmtMode, charp, 1, SK_MAX_CARD_PARAM, 000); +/* not used, just there because every driver should have them: */ +PARAM_ARRAY(options, options, int, 1, SK_MAX_CARD_PARAM, 000); +PARAM(debug, int, 000); /***************************************************************************** * diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/sk_g16.c working-2.4.14-param-all/drivers/net/sk_g16.c --- working-2.4.14-param/drivers/net/sk_g16.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/sk_g16.c Thu Nov 22 08:21:43 2001 @@ -617,7 +617,7 @@ MODULE_AUTHOR("Patrick J.D. Weichmann"); MODULE_DESCRIPTION("Schneider & Koch G16 Ethernet Device Driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(io, "i"); +PARAM(io, int, 000); MODULE_PARM_DESC(io, "0 to probe common ports (unsafe), or the I/O base of the board"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/sk_mca.c working-2.4.14-param-all/drivers/net/sk_mca.c --- working-2.4.14-param/drivers/net/sk_mca.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/sk_mca.c Thu Nov 22 08:21:43 2001 @@ -1276,10 +1276,12 @@ skmca_priv *priv; int z; +#if 0 /* Might as well panic now --RR */ if (MOD_IN_USE) { printk("cannot unload, module in use\n"); return; } +#endif for (z = 0; z < DEVMAX; z++) { dev = moddevs + z; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/slip.c working-2.4.14-param-all/drivers/net/slip.c --- working-2.4.14-param/drivers/net/slip.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/slip.c Thu Nov 22 08:21:43 2001 @@ -95,7 +95,7 @@ static slip_ctrl_t **slip_ctrls; int slip_maxdev = SL_NRUNIT; /* Can be overridden with insmod! */ -MODULE_PARM(slip_maxdev, "i"); +PARAM(slip_maxdev, int, 000); MODULE_PARM_DESC(slip_maxdev, "Maximum number of slip devices"); static struct tty_ldisc sl_ldisc; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/smc-mca.c working-2.4.14-param-all/drivers/net/smc-mca.c --- working-2.4.14-param/drivers/net/smc-mca.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/smc-mca.c Thu Nov 22 08:21:43 2001 @@ -439,8 +439,8 @@ static int irq[MAX_ULTRAMCA_CARDS]; MODULE_LICENSE("GPL"); -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_ULTRAMCA_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_ULTRAMCA_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_ULTRAMCA_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_ULTRAMCA_CARDS, 000); MODULE_PARM_DESC(io, "SMC Ultra/EtherEZ MCA I/O base address(es)"); MODULE_PARM_DESC(irq, "SMC Ultra/EtherEZ MCA IRQ number(s)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/smc-ultra.c working-2.4.14-param-all/drivers/net/smc-ultra.c --- working-2.4.14-param/drivers/net/smc-ultra.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/smc-ultra.c Thu Nov 22 08:21:43 2001 @@ -499,8 +499,8 @@ static int io[MAX_ULTRA_CARDS]; static int irq[MAX_ULTRA_CARDS]; -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_ULTRA_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_ULTRA_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_ULTRA_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_ULTRA_CARDS, 000); MODULE_PARM_DESC(io, "SMC Ultra I/O base address(es)"); MODULE_PARM_DESC(irq, "SMC Ultra IRQ number(s) (assigned)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/smc9194.c working-2.4.14-param-all/drivers/net/smc9194.c --- working-2.4.14-param/drivers/net/smc9194.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/smc9194.c Thu Nov 22 08:21:43 2001 @@ -1560,9 +1560,9 @@ static int ifport; MODULE_LICENSE("GPL"); -MODULE_PARM(io, "i"); -MODULE_PARM(irq, "i"); -MODULE_PARM(ifport, "i"); +PARAM(io, int, 000); +PARAM(irq, int, 000); +PARAM(ifport, int, 000); MODULE_PARM_DESC(io, "SMC 99194 I/O base address"); MODULE_PARM_DESC(irq, "SMC 99194 IRQ number"); MODULE_PARM_DESC(ifport, "SMC 99194 interface port (0-default, 1-TP, 2-AUI)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/starfire.c working-2.4.14-param-all/drivers/net/starfire.c --- working-2.4.14-param/drivers/net/starfire.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/starfire.c Thu Nov 22 08:21:43 2001 @@ -252,13 +252,13 @@ MODULE_DESCRIPTION("Adaptec Starfire Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(mtu, "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(interrupt_mitigation, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); +PARAM(max_interrupt_work, int, 000); +PARAM(mtu, int, 000); +PARAM(debug, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM(interrupt_mitigation, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); MODULE_PARM_DESC(max_interrupt_work, "Starfire maximum events handled per interrupt"); MODULE_PARM_DESC(mtu, "Starfire MTU (all boards)"); MODULE_PARM_DESC(debug, "Starfire debug level (0-6)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/sun3lance.c working-2.4.14-param-all/drivers/net/sun3lance.c --- working-2.4.14-param/drivers/net/sun3lance.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/sun3lance.c Thu Nov 22 08:21:43 2001 @@ -69,7 +69,7 @@ #else static int lance_debug = 1; #endif -MODULE_PARM(lance_debug, "i"); +PARAM(lance_debug, int, 000); MODULE_PARM_DESC(lance_debug, "SUN3 Lance debug level (0-3)"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/sundance.c working-2.4.14-param-all/drivers/net/sundance.c --- working-2.4.14-param/drivers/net/sundance.c Sat Oct 20 01:32:28 2001 +++ working-2.4.14-param-all/drivers/net/sundance.c Thu Nov 22 08:21:43 2001 @@ -114,11 +114,11 @@ MODULE_DESCRIPTION("Sundance Alta Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(mtu, "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(media, "1-" __MODULE_STRING(MAX_UNITS) "s"); +PARAM(max_interrupt_work, int, 000); +PARAM(mtu, int, 000); +PARAM(debug, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM_ARRAY(media, media, int, 1, MAX_UNITS, 000); MODULE_PARM_DESC(max_interrupt_work, "Sundance Alta maximum events handled per interrupt"); MODULE_PARM_DESC(mtu, "Sundance Alta MTU (all boards)"); MODULE_PARM_DESC(debug, "Sundance Alta debug level (0-5)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/sungem.c working-2.4.14-param-all/drivers/net/sungem.c --- working-2.4.14-param/drivers/net/sungem.c Mon Oct 22 03:36:54 2001 +++ working-2.4.14-param-all/drivers/net/sungem.c Thu Nov 22 08:21:43 2001 @@ -52,9 +52,6 @@ MODULE_DESCRIPTION("Sun GEM Gbit ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(gem_debug, "i"); -MODULE_PARM_DESC(gem_debug, "(ignored)"); - #define GEM_MODULE_NAME "gem" #define PFX GEM_MODULE_NAME ": " @@ -63,6 +60,9 @@ #else int gem_debug = 1; #endif + +PARAM(gem_debug, int, 000); +MODULE_PARM_DESC(gem_debug, "(ignored)"); static struct pci_device_id gem_pci_tbl[] __devinitdata = { { PCI_VENDOR_ID_SUN, PCI_DEVICE_ID_SUN_GEM, diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/sunhme.c working-2.4.14-param-all/drivers/net/sunhme.c --- working-2.4.14-param/drivers/net/sunhme.c Sat Oct 13 08:35:53 2001 +++ working-2.4.14-param-all/drivers/net/sunhme.c Thu Nov 22 08:21:43 2001 @@ -72,7 +72,7 @@ static int macaddr[6]; /* accept MAC address of the form macaddr=0x08,0x00,0x20,0x30,0x40,0x50 */ -MODULE_PARM(macaddr, "6i"); +PARAM_ARRAY(macaddr, macaddr, int, 6, 6, 000); MODULE_PARM_DESC(macaddr, "Happy Meal MAC address to set"); static struct happy_meal *root_happy_dev; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/tlan.c working-2.4.14-param-all/drivers/net/tlan.c --- working-2.4.14-param/drivers/net/tlan.c Mon Oct 1 05:26:08 2001 +++ working-2.4.14-param-all/drivers/net/tlan.c Thu Nov 22 08:21:43 2001 @@ -192,11 +192,11 @@ MODULE_DESCRIPTION("Driver for TI ThunderLAN based ethernet PCI adapters"); MODULE_LICENSE("GPL"); -MODULE_PARM(aui, "1-" __MODULE_STRING(MAX_TLAN_BOARDS) "i"); -MODULE_PARM(duplex, "1-" __MODULE_STRING(MAX_TLAN_BOARDS) "i"); -MODULE_PARM(speed, "1-" __MODULE_STRING(MAX_TLAN_BOARDS) "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(bbuf, "i"); +PARAM_ARRAY(aui, aui, int, 1, MAX_TLAN_BOARDS, 000); +PARAM_ARRAY(duplex, duplex, int, 1, MAX_TLAN_BOARDS, 000); +PARAM_ARRAY(speed, speed, int, 1, MAX_TLAN_BOARDS, 000); +PARAM(debug, int, 000); +PARAM(bbuf, int, 000); MODULE_PARM_DESC(aui, "ThunderLAN use AUI port(s) (0-1)"); MODULE_PARM_DESC(duplex, "ThunderLAN duplex setting(s) (0-default, 1-half, 2-full)"); MODULE_PARM_DESC(speed, "ThunderLAN port speen setting(s) (0,10,100)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/tokenring/ibmtr.c working-2.4.14-param-all/drivers/net/tokenring/ibmtr.c --- working-2.4.14-param/drivers/net/tokenring/ibmtr.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/tokenring/ibmtr.c Thu Nov 22 08:21:43 2001 @@ -1926,9 +1926,9 @@ MODULE_LICENSE("GPL"); -MODULE_PARM(io, "1-" __MODULE_STRING(IBMTR_MAX_ADAPTERS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(IBMTR_MAX_ADAPTERS) "i"); -MODULE_PARM(mem, "1-" __MODULE_STRING(IBMTR_MAX_ADAPTERS) "i"); +PARAM_ARRAY(io, io, int, 1, IBMTR_MAX_ADAPTERS, 000); +PARAM_ARRAY(irq, irq, int, 1, IBMTR_MAX_ADAPTERS, 000); +PARAM_ARRAY(mem, mem, int, 1, IBMTR_MAX_ADAPTERS, 000); int init_module(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/tokenring/lanstreamer.c working-2.4.14-param-all/drivers/net/tokenring/lanstreamer.c --- working-2.4.14-param/drivers/net/tokenring/lanstreamer.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/tokenring/lanstreamer.c Thu Nov 22 08:21:43 2001 @@ -160,20 +160,19 @@ static int ringspeed[STREAMER_MAX_ADAPTERS] = { 0, }; -MODULE_PARM(ringspeed, "1-" __MODULE_STRING(STREAMER_MAX_ADAPTERS) "i"); +PARAM_ARRAY(ringspeed, ringspeed, int, 1, STREAMER_MAX_ADAPTERS, 000); /* Packet buffer size */ static int pkt_buf_sz[STREAMER_MAX_ADAPTERS] = { 0, }; -MODULE_PARM(pkt_buf_sz, "1-" __MODULE_STRING(STREAMER_MAX_ADAPTERS) "i"); +PARAM_ARRAY(pkt_buf_sz, pkt_buf_sz, int, 1, STREAMER_MAX_ADAPTERS, 000); /* Message Level */ static int message_level[STREAMER_MAX_ADAPTERS] = { 1, }; -MODULE_PARM(message_level, - "1-" __MODULE_STRING(STREAMER_MAX_ADAPTERS) "i"); +PARAM_ARRAY(message_level, message_level, int, 1, STREAMER_MAX_ADAPTERS, 000); static int streamer_reset(struct net_device *dev); static int streamer_open(struct net_device *dev); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/tokenring/olympic.c working-2.4.14-param-all/drivers/net/tokenring/olympic.c --- working-2.4.14-param/drivers/net/tokenring/olympic.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/tokenring/olympic.c Thu Nov 22 08:21:43 2001 @@ -138,17 +138,17 @@ */ static int ringspeed[OLYMPIC_MAX_ADAPTERS] = {0,} ; -MODULE_PARM(ringspeed, "1-" __MODULE_STRING(OLYMPIC_MAX_ADAPTERS) "i"); +PARAM_ARRAY(ringspeed, ringspeed, int, 1, OLYMPIC_MAX_ADAPTERS, 000); /* Packet buffer size */ static int pkt_buf_sz[OLYMPIC_MAX_ADAPTERS] = {0,} ; -MODULE_PARM(pkt_buf_sz, "1-" __MODULE_STRING(OLYMPIC_MAX_ADAPTERS) "i") ; +PARAM_ARRAY(pkt_buf_sz, pkt_buf_sz, int, 1, OLYMPIC_MAX_ADAPTERS, 000) ; /* Message Level */ static int message_level[OLYMPIC_MAX_ADAPTERS] = {0,} ; -MODULE_PARM(message_level, "1-" __MODULE_STRING(OLYMPIC_MAX_ADAPTERS) "i") ; +PARAM_ARRAY(message_level, message_level, int, 1, OLYMPIC_MAX_ADAPTERS, 000) ; /* Change network_monitor to receive mac frames through the arb channel. * Will also create a /proc/net/olympic_tr%d entry, where %d is the tr @@ -157,7 +157,7 @@ * i.e. it will give you the source address of beaconers on the ring */ static int network_monitor[OLYMPIC_MAX_ADAPTERS] = {0,}; -MODULE_PARM(network_monitor, "1-" __MODULE_STRING(OLYMPIC_MAX_ADAPTERS) "i"); +PARAM_ARRAY(network_monitor, network_monitor, int, 1, OLYMPIC_MAX_ADAPTERS, 000); static struct pci_device_id olympic_pci_tbl[] __devinitdata = { {PCI_VENDOR_ID_IBM,PCI_DEVICE_ID_IBM_TR_WAKE,PCI_ANY_ID,PCI_ANY_ID,}, diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/tokenring/smctr.c working-2.4.14-param-all/drivers/net/tokenring/smctr.c --- working-2.4.14-param/drivers/net/tokenring/smctr.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/tokenring/smctr.c Thu Nov 22 08:21:43 2001 @@ -5735,10 +5735,10 @@ MODULE_LICENSE("GPL"); -MODULE_PARM(io, "1-" __MODULE_STRING(SMCTR_MAX_ADAPTERS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(SMCTR_MAX_ADAPTERS) "i"); -MODULE_PARM(mem, "1-" __MODULE_STRING(SMCTR_MAX_ADAPTERS) "i"); -MODULE_PARM(ringspeed, "1-" __MODULE_STRING(SMCTR_MAX_ADAPTERS) "i"); +PARAM_ARRAY(io, io, int, 1, SMCTR_MAX_ADAPTERS, 000); +PARAM_ARRAY(irq, irq, int, 1, SMCTR_MAX_ADAPTERS, 000); +PARAM_ARRAY(mem, mem, int, 1, SMCTR_MAX_ADAPTERS, 000); +PARAM_ARRAY(ringspeed, ringspeed, int, 1, SMCTR_MAX_ADAPTERS, 000); int init_module(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/tokenring/tmsisa.c working-2.4.14-param-all/drivers/net/tokenring/tmsisa.c --- working-2.4.14-param/drivers/net/tokenring/tmsisa.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/tokenring/tmsisa.c Thu Nov 22 08:21:43 2001 @@ -374,9 +374,9 @@ MODULE_LICENSE("GPL"); -MODULE_PARM(io, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i"); -MODULE_PARM(dma, "1-" __MODULE_STRING(ISATR_MAX_ADAPTERS) "i"); +PARAM_ARRAY(io, io, int, 1, ISATR_MAX_ADAPTERS, 000); +PARAM_ARRAY(irq, irq, int, 1, ISATR_MAX_ADAPTERS, 000); +PARAM_ARRAY(dma, dma, int, 1, ISATR_MAX_ADAPTERS, 000); int init_module(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/tulip/tulip_core.c working-2.4.14-param-all/drivers/net/tulip/tulip_core.c --- working-2.4.14-param/drivers/net/tulip/tulip_core.c Wed Oct 17 14:56:29 2001 +++ working-2.4.14-param-all/drivers/net/tulip/tulip_core.c Thu Nov 22 08:21:43 2001 @@ -102,12 +102,12 @@ MODULE_AUTHOR("The Linux Kernel Team"); MODULE_DESCRIPTION("Digital 21*4* Tulip ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(tulip_debug, "i"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(csr0, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); +PARAM(tulip_debug, int, 000); +PARAM(max_interrupt_work, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM(csr0, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); #define PFX DRV_NAME ": " diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/via-rhine.c working-2.4.14-param-all/drivers/net/via-rhine.c --- working-2.4.14-param/drivers/net/via-rhine.c Tue Oct 16 06:32:32 2001 +++ working-2.4.14-param-all/drivers/net/via-rhine.c Thu Nov 22 08:21:43 2001 @@ -186,11 +186,11 @@ MODULE_DESCRIPTION("VIA Rhine PCI Fast Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); +PARAM(max_interrupt_work, int, 000); +PARAM(debug, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); MODULE_PARM_DESC(max_interrupt_work, "VIA Rhine maximum events handled per interrupt"); MODULE_PARM_DESC(debug, "VIA Rhine debug level (0-7)"); MODULE_PARM_DESC(rx_copybreak, "VIA Rhine copy breakpoint for copy-only-tiny-frames"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wan/c101.c working-2.4.14-param-all/drivers/net/wan/c101.c --- working-2.4.14-param/drivers/net/wan/c101.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/wan/c101.c Thu Nov 22 08:21:43 2001 @@ -342,17 +342,6 @@ } -#ifndef MODULE -static int __init c101_setup(char *str) -{ - hw = str; - return 1; -} - -__setup("c101=", c101_setup); -#endif - - static void __exit c101_cleanup(void) { card_t *card = first_card; @@ -372,5 +361,5 @@ MODULE_AUTHOR("Krzysztof Halasa "); MODULE_DESCRIPTION("Moxa C101 serial port driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(hw, "s"); /* hw=irq,ram:irq,... */ +PARAM(hw, charp, 000); /* hw=irq,ram:irq,... */ EXPORT_NO_SYMBOLS; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wan/cosa.c working-2.4.14-param-all/drivers/net/wan/cosa.c --- working-2.4.14-param/drivers/net/wan/cosa.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/wan/cosa.c Thu Nov 22 08:21:43 2001 @@ -242,11 +242,11 @@ static int irq[MAX_CARDS+1] = { -1, -1, -1, -1, -1, -1, 0, }; #ifdef MODULE -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_CARDS, 000); MODULE_PARM_DESC(io, "The I/O bases of the COSA or SRP cards"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_CARDS) "i"); +PARAM_ARRAY(irq, irq, int, 1, MAX_CARDS, 000); MODULE_PARM_DESC(irq, "The IRQ lines of the COSA or SRP cards"); -MODULE_PARM(dma, "1-" __MODULE_STRING(MAX_CARDS) "i"); +PARAM_ARRAY(dma, dma, int, 1, MAX_CARDS, 000); MODULE_PARM_DESC(dma, "The DMA channels of the COSA or SRP cards"); MODULE_AUTHOR("Jan \"Yenya\" Kasprzak, "); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wan/cycx_main.c working-2.4.14-param-all/drivers/net/wan/cycx_main.c --- working-2.4.14-param/drivers/net/wan/cycx_main.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/wan/cycx_main.c Thu Nov 22 08:21:43 2001 @@ -57,7 +57,7 @@ MODULE_AUTHOR("Arnaldo Carvalho de Melo"); MODULE_DESCRIPTION("Cyclom 2X Sync Card Driver."); MODULE_LICENSE("GPL"); -MODULE_PARM(cycx_debug, "i"); +PARAM(cycx_debug, int, 000); MODULE_PARM_DESC(cycx_debug, "cyclomx debug level"); /* Defines & Macros */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wan/dscc4.c working-2.4.14-param-all/drivers/net/wan/dscc4.c --- working-2.4.14-param/drivers/net/wan/dscc4.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/wan/dscc4.c Thu Nov 22 08:21:43 2001 @@ -115,7 +115,7 @@ MODULE_AUTHOR("Maintainer: Francois Romieu "); MODULE_DESCRIPTION("Siemens PEB20534 PCI Controller"); MODULE_LICENSE("GPL"); -MODULE_PARM(debug,"i"); +PARAM(debug, int, 000); /* Structures */ struct TxFD { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wan/hostess_sv11.c working-2.4.14-param-all/drivers/net/wan/hostess_sv11.c --- working-2.4.14-param/drivers/net/wan/hostess_sv11.c Mon Oct 1 05:26:08 2001 +++ working-2.4.14-param-all/drivers/net/wan/hostess_sv11.c Thu Nov 22 08:21:43 2001 @@ -384,11 +384,11 @@ static int io=0x200; static int irq=9; -MODULE_PARM(io,"i"); +PARAM(io, int, 000); MODULE_PARM_DESC(io, "The I/O base of the Comtrol Hostess SV11 card"); -MODULE_PARM(dma,"i"); +PARAM(dma, int, 000); MODULE_PARM_DESC(dma, "Set this to 1 to use DMA1/DMA3 for TX/RX"); -MODULE_PARM(irq,"i"); +PARAM(irq, int, 000); MODULE_PARM_DESC(irq, "The interrupt line setting for the Comtrol Hostess SV11 card"); MODULE_AUTHOR("Alan Cox"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wan/n2.c working-2.4.14-param-all/drivers/net/wan/n2.c --- working-2.4.14-param/drivers/net/wan/n2.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/wan/n2.c Thu Nov 22 08:21:43 2001 @@ -558,17 +558,6 @@ } -#ifndef MODULE -static int __init n2_setup(char *str) -{ - hw = str; - return 1; -} - -__setup("n2=", n2_setup); -#endif - - static void __exit n2_cleanup(void) { card_t *card = first_card; @@ -587,5 +576,5 @@ MODULE_AUTHOR("Krzysztof Halasa "); MODULE_DESCRIPTION("RISCom/N2 serial port driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(hw, "s"); /* hw=io,irq,ram,ports:io,irq,... */ +PARAM(hw, charp, 000); /* hw=io,irq,ram,ports:io,irq,... */ EXPORT_NO_SYMBOLS; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wan/sbni.c working-2.4.14-param-all/drivers/net/wan/sbni.c --- working-2.4.14-param/drivers/net/wan/sbni.c Sat Sep 15 07:40:00 2001 +++ working-2.4.14-param-all/drivers/net/wan/sbni.c Thu Nov 22 08:21:43 2001 @@ -1466,19 +1466,14 @@ } -#ifdef MODULE - -MODULE_PARM( io, "1-" __MODULE_STRING( SBNI_MAX_NUM_CARDS ) "i" ); -MODULE_PARM( irq, "1-" __MODULE_STRING( SBNI_MAX_NUM_CARDS ) "i" ); -MODULE_PARM( baud, "1-" __MODULE_STRING( SBNI_MAX_NUM_CARDS ) "i" ); -MODULE_PARM( rxl, "1-" __MODULE_STRING( SBNI_MAX_NUM_CARDS ) "i" ); -MODULE_PARM( mac, "1-" __MODULE_STRING( SBNI_MAX_NUM_CARDS ) "i" ); - -MODULE_PARM( skip_pci_probe, "i" ); +PARAM_ARRAY(io, io, int, 1, SBNI_MAX_NUM_CARDS, S_IRUGO); +PARAM_ARRAY(irq, irq, int, 1, SBNI_MAX_NUM_CARDS, S_IRUGO); +PARAM_ARRAY(rxl, rxl, int, 1, SBNI_MAX_NUM_CARDS, S_IRUGO); +PARAM_ARRAY(mac, mac, int, 1, SBNI_MAX_NUM_CARDS, S_IRUGO); +PARAM(skip_pci_probe, int, 000); MODULE_LICENSE("GPL"); - int init_module( void ) { @@ -1518,37 +1513,6 @@ kfree( dev ); } } - -#else /* MODULE */ - -static int __init -sbni_setup( char *p ) -{ - int n, parm; - - if( *p++ != '(' ) - goto bad_param; - - for( n = 0, parm = 0; *p && n < 8; ) { - (*dest[ parm ])[ n ] = simple_strtol( p, &p, 0 ); - if( !*p || *p == ')' ) - return 1; - if( *p == ';' ) - ++p, ++n, parm = 0; - else if( *p++ != ',' ) - break; - else - if( ++parm >= 5 ) - break; - } -bad_param: - printk( KERN_ERR "Error in sbni kernel parameter!\n" ); - return 0; -} - -__setup( "sbni=", sbni_setup ); - -#endif /* MODULE */ /* -------------------------------------------------------------------------- */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wan/sealevel.c working-2.4.14-param-all/drivers/net/wan/sealevel.c --- working-2.4.14-param/drivers/net/wan/sealevel.c Mon Oct 1 05:26:08 2001 +++ working-2.4.14-param-all/drivers/net/wan/sealevel.c Thu Nov 22 08:21:43 2001 @@ -428,15 +428,15 @@ static int irq=5; static int slow=0; -MODULE_PARM(io,"i"); +PARAM(io, int, 000); MODULE_PARM_DESC(io, "The I/O base of the Sealevel card"); -MODULE_PARM(txdma,"i"); +PARAM(txdma, int, 000); MODULE_PARM_DESC(txdma, "Transmit DMA channel"); -MODULE_PARM(rxdma,"i"); +PARAM(rxdma, int, 000); MODULE_PARM_DESC(rxdma, "Receive DMA channel"); -MODULE_PARM(irq,"i"); +PARAM(irq, int, 000); MODULE_PARM_DESC(irq, "The interrupt line setting for the SeaLevel card"); -MODULE_PARM(slow,"i"); +PARAM(slow, int, 000); MODULE_PARM_DESC(slow, "Set this for an older Sealevel card such as the 4012"); MODULE_AUTHOR("Alan Cox"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wan/syncppp.c working-2.4.14-param-all/drivers/net/wan/syncppp.c --- working-2.4.14-param/drivers/net/wan/syncppp.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/wan/syncppp.c Thu Nov 22 08:21:43 2001 @@ -1419,6 +1419,6 @@ module_init(sync_ppp_init); module_exit(sync_ppp_cleanup); -MODULE_PARM(debug,"1i"); +PARAM(debug, int, 000); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wan/x25_asy.c working-2.4.14-param-all/drivers/net/wan/x25_asy.c --- working-2.4.14-param/drivers/net/wan/x25_asy.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/wan/x25_asy.c Thu Nov 22 08:21:43 2001 @@ -43,7 +43,7 @@ int x25_asy_maxdev = SL_NRUNIT; /* Can be overridden with insmod! */ -MODULE_PARM(x25_asy_maxdev, "i"); +PARAM(x25_asy_maxdev, int, 000); MODULE_LICENSE("GPL"); static struct tty_ldisc x25_ldisc; diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wavelan.p.h working-2.4.14-param-all/drivers/net/wavelan.p.h --- working-2.4.14-param/drivers/net/wavelan.p.h Sat Oct 13 07:21:18 2001 +++ working-2.4.14-param-all/drivers/net/wavelan.p.h Thu Nov 22 08:21:43 2001 @@ -697,17 +697,15 @@ 0x390, 0x3E0 }; -#ifdef MODULE -/* Parameters set by insmod */ +/* Parameters set by modprobe/boot line */ static int io[4]; static int irq[4]; -static char name[4][IFNAMSIZ]; -MODULE_PARM(io, "1-4i"); -MODULE_PARM(irq, "1-4i"); -MODULE_PARM(name, "1-4c" __MODULE_STRING(IFNAMSIZ)); +static char *name[4]; +PARAM_ARRAY(io, io, int, 1, 4, 000); +PARAM_ARRAY(irq, irq, int, 1, 4, 000); +PARAM_ARRAY(name, name, charp, 1, 4, 000); MODULE_PARM_DESC(io, "WaveLAN I/O base address(es),required"); MODULE_PARM_DESC(irq, "WaveLAN IRQ number(s)"); MODULE_PARM_DESC(name, "WaveLAN interface neme(s)"); -#endif /* MODULE */ #endif /* WAVELAN_P_H */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wd.c working-2.4.14-param-all/drivers/net/wd.c --- working-2.4.14-param/drivers/net/wd.c Mon Oct 1 05:26:07 2001 +++ working-2.4.14-param-all/drivers/net/wd.c Thu Nov 22 08:21:43 2001 @@ -446,10 +446,10 @@ static int mem[MAX_WD_CARDS]; static int mem_end[MAX_WD_CARDS]; /* for non std. mem size */ -MODULE_PARM(io, "1-" __MODULE_STRING(MAX_WD_CARDS) "i"); -MODULE_PARM(irq, "1-" __MODULE_STRING(MAX_WD_CARDS) "i"); -MODULE_PARM(mem, "1-" __MODULE_STRING(MAX_WD_CARDS) "i"); -MODULE_PARM(mem_end, "1-" __MODULE_STRING(MAX_WD_CARDS) "i"); +PARAM_ARRAY(io, io, int, 1, MAX_WD_CARDS, 000); +PARAM_ARRAY(irq, irq, int, 1, MAX_WD_CARDS, 000); +PARAM_ARRAY(mem, mem, int, 1, MAX_WD_CARDS, 000); +PARAM_ARRAY(mem_end, mem_end, int, 1, MAX_WD_CARDS, 000); MODULE_PARM_DESC(io, "WD80x3 I/O base address(es)"); MODULE_PARM_DESC(irq, "WD80x3 IRQ number(s) (ignored for PureData boards)"); MODULE_PARM_DESC(mem, "WD80x3 memory base address(es)(ignored for PureData boards)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/winbond-840.c working-2.4.14-param-all/drivers/net/winbond-840.c --- working-2.4.14-param/drivers/net/winbond-840.c Wed Oct 10 08:13:02 2001 +++ working-2.4.14-param-all/drivers/net/winbond-840.c Thu Nov 22 08:21:43 2001 @@ -151,12 +151,12 @@ MODULE_DESCRIPTION("Winbond W89c840 Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(multicast_filter_limit, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); +PARAM(max_interrupt_work, int, 000); +PARAM(debug, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM(multicast_filter_limit, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); MODULE_PARM_DESC(max_interrupt_work, "winbond-840 maximum events handled per interrupt"); MODULE_PARM_DESC(debug, "winbond-840 debug level (0-6)"); MODULE_PARM_DESC(rx_copybreak, "winbond-840 copy breakpoint for copy-only-tiny-frames"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wireless/airo.c working-2.4.14-param-all/drivers/net/wireless/airo.c --- working-2.4.14-param/drivers/net/wireless/airo.c Sat Oct 20 01:32:28 2001 +++ working-2.4.14-param-all/drivers/net/wireless/airo.c Thu Nov 22 08:21:43 2001 @@ -230,34 +230,34 @@ for PCMCIA when used with airo_cs."); MODULE_LICENSE("Dual BSD/GPL"); MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340"); -MODULE_PARM(io,"1-4i"); -MODULE_PARM(irq,"1-4i"); -MODULE_PARM(basic_rate,"i"); -MODULE_PARM(rates,"1-8i"); -MODULE_PARM(ssids,"1-3s"); -MODULE_PARM(auto_wep,"i"); +PARAM_ARRAY(io, io, int, 1, 4, 000); +PARAM_ARRAY(irq, irq, int, 1, 4, 000); +PARAM(basic_rate, int, 000); +PARAM_ARRAY(rates, rates, int, 1, 8, 000); +PARAM_ARRAY(ssids, ssids, charp, 1, 3, 000); +PARAM(auto_wep, int, 000); MODULE_PARM_DESC(auto_wep, "If non-zero, the driver will keep looping through \ the authentication options until an association is made. The value of \ auto_wep is number of the wep keys to check. A value of 2 will try using \ the key at index 0 and index 1."); -MODULE_PARM(aux_bap,"i"); +PARAM(aux_bap, int, 000); MODULE_PARM_DESC(aux_bap, "If non-zero, the driver will switch into a mode \ than seems to work better for older cards with some older buses. Before \ switching it checks that the switch is needed."); -MODULE_PARM(maxencrypt, "i"); +PARAM(maxencrypt, int, 000); MODULE_PARM_DESC(maxencrypt, "The maximum speed that the card can do \ encryption. Units are in 512kbs. Zero (default) means there is no limit. \ Older cards used to be limited to 2mbs (4)."); -MODULE_PARM(adhoc, "i"); +PARAM(adhoc, int, 000); MODULE_PARM_DESC(adhoc, "If non-zero, the card will start in adhoc mode."); -MODULE_PARM(proc_uid, "i"); +PARAM(proc_uid, int, 000); MODULE_PARM_DESC(proc_uid, "The uid that the /proc files will belong to."); -MODULE_PARM(proc_gid, "i"); +PARAM(proc_gid, int, 000); MODULE_PARM_DESC(proc_gid, "The gid that the /proc files will belong to."); -MODULE_PARM(airo_perm, "i"); +PARAM(airo_perm, int, 000); MODULE_PARM_DESC(airo_perm, "The permission bits of /proc/[driver/]aironet."); -MODULE_PARM(proc_perm, "i"); +PARAM(proc_perm, int, 000); MODULE_PARM_DESC(proc_perm, "The permission bits of the files in /proc"); #include diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wireless/airo_cs.c working-2.4.14-param-all/drivers/net/wireless/airo_cs.c --- working-2.4.14-param/drivers/net/wireless/airo_cs.c Fri Sep 14 09:04:43 2001 +++ working-2.4.14-param-all/drivers/net/wireless/airo_cs.c Thu Nov 22 08:21:43 2001 @@ -54,7 +54,7 @@ */ #ifdef PCMCIA_DEBUG static int pc_debug = PCMCIA_DEBUG; -MODULE_PARM(pc_debug, "i"); +PARAM(pc_debug, int, 000); static char *version = "$Revision: 1.2 $"; #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args); #else @@ -77,8 +77,8 @@ with the airo module."); MODULE_LICENSE("Dual BSD/GPL"); MODULE_SUPPORTED_DEVICE("Aironet 4500, 4800 and Cisco 340 PCMCIA cards"); -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); +PARAM(irq_mask, int, 000); +PARAM_ARRAY(irq_list, irq_list, int, 1, 4, 000); /*====================================================================*/ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wireless/orinoco.c working-2.4.14-param-all/drivers/net/wireless/orinoco.c --- working-2.4.14-param/drivers/net/wireless/orinoco.c Wed Oct 10 08:13:03 2001 +++ working-2.4.14-param-all/drivers/net/wireless/orinoco.c Thu Nov 22 08:21:43 2001 @@ -270,11 +270,11 @@ /* Level of debugging. Used in the macros in orinoco.h */ #ifdef ORINOCO_DEBUG int dldwd_debug = ORINOCO_DEBUG; -MODULE_PARM(dldwd_debug, "i"); +PARAM(dldwd_debug, int, 000); #endif int use_old_encaps = 0; -MODULE_PARM(use_old_encaps, "i"); +PARAM(use_old_encaps, int, 000); #define SYMBOL_MAX_VER_LEN (14) diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/wireless/orinoco_cs.c working-2.4.14-param-all/drivers/net/wireless/orinoco_cs.c --- working-2.4.14-param/drivers/net/wireless/orinoco_cs.c Wed Oct 10 08:13:03 2001 +++ working-2.4.14-param-all/drivers/net/wireless/orinoco_cs.c Thu Nov 22 08:21:43 2001 @@ -50,7 +50,7 @@ MODULE_DESCRIPTION("Driver for PCMCIA Lucent Orinoco, Prism II based and similar wireless cards"); MODULE_LICENSE("Dual MPL/GPL"); -/* Parameters that can be set with 'insmod' */ +/* Parameters */ /* The old way: bit map of interrupts to choose from */ /* This means pick from 15, 14, 12, 11, 10, 9, 7, 5, 4, and 3 */ @@ -63,11 +63,10 @@ * don't have any CIS entry for it. This workaround it... */ static int ignore_cis_vcc; /* = 0 */ -MODULE_PARM(irq_mask, "i"); -MODULE_PARM(irq_list, "1-4i"); -MODULE_PARM(reset_cor, "i"); -MODULE_PARM(ignore_cis_vcc, "i"); - +PARAM(irq_mask, uint, 000); +PARAM_ARRAY(irq_list, int, irq_list, 1, 4, 000); +PARAM(reset_cor, int, 000); +PARAM(ignore_cis_vcc, int, 000); /* Pcmcia specific structure */ typedef struct dldwd_card { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/net/yellowfin.c working-2.4.14-param-all/drivers/net/yellowfin.c --- working-2.4.14-param/drivers/net/yellowfin.c Sat Oct 20 01:32:28 2001 +++ working-2.4.14-param-all/drivers/net/yellowfin.c Thu Nov 22 08:21:43 2001 @@ -155,13 +155,13 @@ MODULE_DESCRIPTION("Packet Engines Yellowfin G-NIC Gigabit Ethernet driver"); MODULE_LICENSE("GPL"); -MODULE_PARM(max_interrupt_work, "i"); -MODULE_PARM(mtu, "i"); -MODULE_PARM(debug, "i"); -MODULE_PARM(rx_copybreak, "i"); -MODULE_PARM(options, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(full_duplex, "1-" __MODULE_STRING(MAX_UNITS) "i"); -MODULE_PARM(gx_fix, "i"); +PARAM(max_interrupt_work, int, 000); +PARAM(mtu, int, 000); +PARAM(debug, int, 000); +PARAM(rx_copybreak, int, 000); +PARAM_ARRAY(options, options, int, 1, MAX_UNITS, 000); +PARAM_ARRAY(full_duplex, full_duplex, int, 1, MAX_UNITS, 000); +PARAM(gx_fix, int, 000); MODULE_PARM_DESC(max_interrupt_work, "G-NIC maximum events handled per interrupt"); MODULE_PARM_DESC(mtu, "G-NIC MTU (all boards)"); MODULE_PARM_DESC(debug, "G-NIC debug level (0-7)"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/parport/init.c working-2.4.14-param-all/drivers/parport/init.c --- working-2.4.14-param/drivers/parport/init.c Wed Jul 11 09:07:46 2001 +++ working-2.4.14-param-all/drivers/parport/init.c Thu Nov 22 08:21:35 2001 @@ -18,7 +18,6 @@ #include #include -#ifndef MODULE static int io[PARPORT_MAX+1] __initdata = { [0 ... PARPORT_MAX] = 0 }; #ifdef CONFIG_PARPORT_PC static int io_hi[PARPORT_MAX+1] __initdata = @@ -43,7 +42,7 @@ * * IRQ/DMA may be numeric or 'auto' or 'none' */ -static int __init parport_setup (char *str) +static int __init parport_setup (char *str, struct kernel_param *kp) { char *endptr; char *sep; @@ -52,24 +51,24 @@ if (!str || !*str || (*str == '0' && !*(str+1))) { /* Disable parport if "parport=0" in cmdline */ io[0] = PARPORT_DISABLE; - return 1; + return 0; } if (!strncmp (str, "auto", 4)) { irq[0] = PARPORT_IRQ_AUTO; dma[0] = PARPORT_DMA_AUTO; - return 1; + return 0; } val = simple_strtoul (str, &endptr, 0); if (endptr == str) { printk (KERN_WARNING "parport=%s not understood\n", str); - return 1; + return 0; } if (parport_setup_ptr == PARPORT_MAX) { printk(KERN_ERR "parport=%s ignored, too many ports\n", str); - return 1; + return 0; } io[parport_setup_ptr] = val; @@ -86,7 +85,7 @@ printk (KERN_WARNING "parport=%s: irq not understood\n", str); - return 1; + return 0; } irq[parport_setup_ptr] = val; } @@ -104,19 +103,17 @@ printk (KERN_WARNING "parport=%s: dma not understood\n", str); - return 1; + return -EINVAL; } dma[parport_setup_ptr] = val; } } parport_setup_ptr++; - return 1; + return 0; } -__setup ("parport=", parport_setup); - -#endif +PARAM_CALL(parport, parport_setup, NULL); #ifdef MODULE int init_module(void) diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/s390/net/ctcmain.c working-2.4.14-param-all/drivers/s390/net/ctcmain.c --- working-2.4.14-param/drivers/s390/net/ctcmain.c Fri Oct 12 02:43:29 2001 +++ working-2.4.14-param-all/drivers/s390/net/ctcmain.c Thu Nov 22 08:21:43 2001 @@ -98,12 +98,11 @@ MODULE_DESCRIPTION("Linux for S/390 CTC/Escon Driver"); MODULE_LICENSE("GPL"); #ifndef CTC_CHANDEV -MODULE_PARM(ctc, "s"); +char *ctc = NULL; +PARAM(ctc, charp, 000); MODULE_PARM_DESC(ctc, "One or more definitions in the same format like the kernel param for ctc.\n" "E.g.: ctc0:0x700:0x701:0:ctc1:0x702:0x703:0\n"); - -char *ctc = NULL; #endif #else /** @@ -3369,7 +3368,7 @@ } #if LINUX_VERSION_CODE >= 0x020300 -__setup("ctc=", ctc_setup); +PARAM_CALL(ctc, ctc_setup, NULL); #endif #endif /* !CTC_CHANDEV */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/drivers/s390/net/netiucv.c working-2.4.14-param-all/drivers/s390/net/netiucv.c --- working-2.4.14-param/drivers/s390/net/netiucv.c Fri Oct 12 02:43:29 2001 +++ working-2.4.14-param-all/drivers/s390/net/netiucv.c Thu Nov 22 08:21:43 2001 @@ -67,7 +67,7 @@ MODULE_AUTHOR ("(C) 2001 IBM Corporation by Fritz Elfert (felfert@millenux.com)"); MODULE_DESCRIPTION ("Linux for S/390 IUCV network driver"); -MODULE_PARM (iucv, "1s"); +PARAM_ARRAY(iucv, iucv, charp, 1, MAX_DEVICES, 000); MODULE_PARM_DESC (iucv, "Specify the initial remote userids for iucv0 .. iucvn:\n" "iucv=userid0:userid1:...:useridN\n"); @@ -2035,7 +2035,7 @@ } # if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0)) -__setup ("iucv=", iucv_setup); +PARAM_CALL(iucv, iucv_setup, NULL); # endif #else static void diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/core/dev.c working-2.4.14-param-all/net/core/dev.c --- working-2.4.14-param/net/core/dev.c Tue Nov 6 11:41:43 2001 +++ working-2.4.14-param-all/net/core/dev.c Thu Nov 22 08:21:43 2001 @@ -364,14 +364,14 @@ /* * Saves at boot time configured settings for any netdevice. */ -int __init netdev_boot_setup(char *str) +int __init netdev_boot_setup(char *str, struct kernel_param *kp) { int ints[5]; struct ifmap map; str = get_options(str, ARRAY_SIZE(ints), ints); if (!str || !*str) - return 0; + return -EINVAL; /* Save settings */ memset(&map, 0, sizeof(map)); @@ -388,7 +388,7 @@ return netdev_boot_setup_add(str, &map); } -__setup("netdev=", netdev_boot_setup); +PARAM_CALL(netdev, netdev_boot_setup, NULL); /***************************************************************************************** diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/decnet/af_decnet.c working-2.4.14-param-all/net/decnet/af_decnet.c --- working-2.4.14-param/net/decnet/af_decnet.c Thu Jun 28 10:10:55 2001 +++ working-2.4.14-param-all/net/decnet/af_decnet.c Thu Nov 22 08:21:43 2001 @@ -2148,7 +2148,7 @@ static int addr[2] = {0, 0}; -MODULE_PARM(addr, "2i"); +PARAM_ARRAY(addr, addr, int, 2, 2, 000); MODULE_PARM_DESC(addr, "The DECnet address of this machine: area,node"); #endif @@ -2201,21 +2201,6 @@ return 0; } - -#ifndef MODULE -static int __init decnet_setup(char *str) -{ - unsigned short area = simple_strtoul(str, &str, 0); - unsigned short node = simple_strtoul(*str > 0 ? ++str : str, &str, 0); - - decnet_address = dn_htons(area << 10 | node); - dn_dn2eth(decnet_ether_address, dn_ntohs(decnet_address)); - - return 1; -} - -__setup("decnet=", decnet_setup); -#endif static void __exit decnet_exit(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ethernet/eth.c working-2.4.14-param-all/net/ethernet/eth.c --- working-2.4.14-param/net/ethernet/eth.c Sat Mar 3 06:02:15 2001 +++ working-2.4.14-param-all/net/ethernet/eth.c Thu Nov 22 08:21:43 2001 @@ -61,9 +61,9 @@ #include #include -extern int __init netdev_boot_setup(char *str); +extern int __init netdev_boot_setup(char *str, struct kernel_param *kp); -__setup("ether=", netdev_boot_setup); +PARAM_CALL(ether, netdev_boot_setup, NULL); /* * Create the Ethernet MAC header for an arbitrary protocol layer diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ipv4/ipconfig.c working-2.4.14-param-all/net/ipv4/ipconfig.c --- working-2.4.14-param/net/ipv4/ipconfig.c Tue Nov 6 11:41:43 2001 +++ working-2.4.14-param-all/net/ipv4/ipconfig.c Thu Nov 22 08:21:43 2001 @@ -1281,7 +1281,7 @@ return 0; } -static int __init ip_auto_config_setup(char *addrs) +static int __init ip_auto_config_setup(char *addrs, struct kernel_param *kp) { char *cp, *ip, *dp; int num = 0; @@ -1292,10 +1292,10 @@ (strcmp(addrs, "off") != 0) && (strcmp(addrs, "none") != 0)); if (!ic_enable) - return 1; + return 0; if (ic_proto_name(addrs)) - return 1; + return 0; /* Parse the whole string */ ip = addrs; @@ -1344,13 +1344,13 @@ num++; } - return 1; + return 0; } -static int __init nfsaddrs_config_setup(char *addrs) +static int __init nfsaddrs_config_setup(char *addrs, struct kernel_param *kp) { - return ip_auto_config_setup(addrs); + return ip_auto_config_setup(addrs, kp); } -__setup("ip=", ip_auto_config_setup); -__setup("nfsaddrs=", nfsaddrs_config_setup); +PARAM_CALL(ip, ip_auto_config_setup, NULL); +PARAM_CALL(nfsaddrs, nfsaddrs_config_setup, NULL); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ipv4/netfilter/ip_conntrack_core.c working-2.4.14-param-all/net/ipv4/netfilter/ip_conntrack_core.c --- working-2.4.14-param/net/ipv4/netfilter/ip_conntrack_core.c Wed Aug 8 01:30:50 2001 +++ working-2.4.14-param-all/net/ipv4/netfilter/ip_conntrack_core.c Thu Nov 22 08:21:43 2001 @@ -1070,7 +1070,7 @@ } static int hashsize = 0; -MODULE_PARM(hashsize, "i"); +PARAM(hashsize, int, 000); int __init ip_conntrack_init(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ipv4/netfilter/ip_conntrack_ftp.c working-2.4.14-param-all/net/ipv4/netfilter/ip_conntrack_ftp.c --- working-2.4.14-param/net/ipv4/netfilter/ip_conntrack_ftp.c Tue Nov 6 11:41:43 2001 +++ working-2.4.14-param-all/net/ipv4/netfilter/ip_conntrack_ftp.c Thu Nov 22 08:21:43 2001 @@ -17,11 +17,11 @@ static int ports[MAX_PORTS]; static int ports_c; #ifdef MODULE_PARM -MODULE_PARM(ports, "1-" __MODULE_STRING(MAX_PORTS) "i"); +PARAM_ARRAY(ports, ports, int, 1, MAX_PORTS, 000); #endif static int loose = 0; -MODULE_PARM(loose, "i"); +PARAM(loose, int, S_IRUGO|S_IWUSR); #if 0 #define DEBUGP printk diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ipv4/netfilter/ip_conntrack_irc.c working-2.4.14-param-all/net/ipv4/netfilter/ip_conntrack_irc.c --- working-2.4.14-param/net/ipv4/netfilter/ip_conntrack_irc.c Tue Nov 6 11:41:43 2001 +++ working-2.4.14-param-all/net/ipv4/netfilter/ip_conntrack_irc.c Thu Nov 22 08:31:53 2001 @@ -34,10 +34,8 @@ MODULE_AUTHOR("Harald Welte "); MODULE_DESCRIPTION("IRC (DCC) connection tracking module"); MODULE_LICENSE("GPL"); -#ifdef MODULE_PARM -MODULE_PARM(ports, "1-" __MODULE_STRING(MAX_PORTS) "i"); +PARAM_ARRAY(ports, ports, int, 1, MAX_PORTS, S_IRUGO); MODULE_PARM_DESC(ports, "port numbers of IRC servers"); -#endif #define NUM_DCCPROTO 5 struct dccproto dccprotos[NUM_DCCPROTO] = { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ipv4/netfilter/ip_nat_ftp.c working-2.4.14-param-all/net/ipv4/netfilter/ip_nat_ftp.c --- working-2.4.14-param/net/ipv4/netfilter/ip_nat_ftp.c Tue Nov 6 11:41:43 2001 +++ working-2.4.14-param-all/net/ipv4/netfilter/ip_nat_ftp.c Thu Nov 22 08:21:43 2001 @@ -21,7 +21,7 @@ static int ports_c = 0; #ifdef MODULE_PARM -MODULE_PARM(ports, "1-" __MODULE_STRING(MAX_PORTS) "i"); +PARAM_ARRAY(ports, ports, int, 1, MAX_PORTS, 000); #endif DECLARE_LOCK_EXTERN(ip_ftp_lock); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ipv4/netfilter/ip_nat_irc.c working-2.4.14-param-all/net/ipv4/netfilter/ip_nat_irc.c --- working-2.4.14-param/net/ipv4/netfilter/ip_nat_irc.c Tue Nov 6 11:41:43 2001 +++ working-2.4.14-param-all/net/ipv4/netfilter/ip_nat_irc.c Thu Nov 22 08:32:15 2001 @@ -41,10 +41,8 @@ MODULE_AUTHOR("Harald Welte "); MODULE_DESCRIPTION("IRC (DCC) network address translation module"); MODULE_LICENSE("GPL"); -#ifdef MODULE_PARM -MODULE_PARM(ports, "1-" __MODULE_STRING(MAX_PORTS) "i"); +PARAM_ARRAY(ports, ports, int, 1, MAX_PORTS, S_IRUGO); MODULE_PARM_DESC(ports, "port numbers of IRC servers"); -#endif /* protects irc part of conntracks */ DECLARE_LOCK_EXTERN(ip_irc_lock); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ipv4/netfilter/ip_nat_snmp_basic.c working-2.4.14-param-all/net/ipv4/netfilter/ip_nat_snmp_basic.c --- working-2.4.14-param/net/ipv4/netfilter/ip_nat_snmp_basic.c Tue Nov 6 11:41:43 2001 +++ working-2.4.14-param-all/net/ipv4/netfilter/ip_nat_snmp_basic.c Thu Nov 22 08:32:29 2001 @@ -1349,6 +1349,6 @@ module_init(init); module_exit(fini); -MODULE_PARM(debug, "i"); +PARAM(debug, int, S_IWUSR|S_IRUGO); MODULE_DESCRIPTION("Basic SNMP Application Layer Gateway"); MODULE_LICENSE("GPL"); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ipv4/netfilter/iptable_filter.c working-2.4.14-param-all/net/ipv4/netfilter/iptable_filter.c --- working-2.4.14-param/net/ipv4/netfilter/iptable_filter.c Mon Oct 1 05:26:08 2001 +++ working-2.4.14-param-all/net/ipv4/netfilter/iptable_filter.c Thu Nov 22 08:21:43 2001 @@ -123,7 +123,7 @@ /* Default to forward because I got too much mail already. */ static int forward = NF_ACCEPT; -MODULE_PARM(forward, "i"); +PARAM(forward, int, 000); static int __init init(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ipv6/af_inet6.c working-2.4.14-param-all/net/ipv6/af_inet6.c --- working-2.4.14-param/net/ipv6/af_inet6.c Thu Nov 22 08:19:48 2001 +++ working-2.4.14-param-all/net/ipv6/af_inet6.c Thu Nov 22 08:21:43 2001 @@ -70,7 +70,7 @@ #if defined(MODULE) && LINUX_VERSION_CODE > 0x20115 MODULE_AUTHOR("Cast of dozens"); MODULE_DESCRIPTION("IPv6 protocol stack for Linux"); -MODULE_PARM(unloadable, "i"); +PARAM(unloadable, int, 000); #endif /* IPv6 procfs goodies... */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/ipv6/netfilter/ip6table_filter.c working-2.4.14-param-all/net/ipv6/netfilter/ip6table_filter.c --- working-2.4.14-param/net/ipv6/netfilter/ip6table_filter.c Mon Oct 1 05:26:08 2001 +++ working-2.4.14-param-all/net/ipv6/netfilter/ip6table_filter.c Thu Nov 22 08:21:43 2001 @@ -125,7 +125,7 @@ /* Default to forward because I got too much mail already. */ static int forward = NF_ACCEPT; -MODULE_PARM(forward, "i"); +PARAM(forward, int, 000); static int __init init(void) { diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/irda/af_irda.c working-2.4.14-param-all/net/irda/af_irda.c --- working-2.4.14-param/net/irda/af_irda.c Fri Oct 5 11:41:09 2001 +++ working-2.4.14-param-all/net/irda/af_irda.c Thu Nov 22 08:21:43 2001 @@ -2574,6 +2574,6 @@ MODULE_DESCRIPTION("The Linux IrDA Protocol Subsystem"); MODULE_LICENSE("GPL"); #ifdef CONFIG_IRDA_DEBUG -MODULE_PARM(irda_debug, "1l"); +PARAM(irda_debug, uint, S_IWUSR|S_IRUGO); #endif #endif /* MODULE */ diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/irda/irlan/irlan_common.c working-2.4.14-param-all/net/irda/irlan/irlan_common.c --- working-2.4.14-param/net/irda/irlan/irlan_common.c Mon Oct 1 05:26:09 2001 +++ working-2.4.14-param-all/net/irda/irlan/irlan_common.c Thu Nov 22 08:21:43 2001 @@ -1186,9 +1186,9 @@ MODULE_DESCRIPTION("The Linux IrDA LAN protocol"); MODULE_LICENSE("GPL"); -MODULE_PARM(eth, "i"); +PARAM(eth, int, 000); MODULE_PARM_DESC(eth, "Name devices ethX (0) or irlanX (1)"); -MODULE_PARM(access, "i"); +PARAM(access, int, 000); MODULE_PARM_DESC(access, "Access type DIRECT=1, PEER=2, HOSTED=3"); /* diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/netrom/af_netrom.c working-2.4.14-param-all/net/netrom/af_netrom.c --- working-2.4.14-param/net/netrom/af_netrom.c Tue Sep 11 00:58:35 2001 +++ working-2.4.14-param-all/net/netrom/af_netrom.c Thu Nov 22 08:21:43 2001 @@ -1310,7 +1310,7 @@ EXPORT_NO_SYMBOLS; -MODULE_PARM(nr_ndevs, "i"); +PARAM(nr_ndevs, int, 000); MODULE_PARM_DESC(nr_ndevs, "number of NET/ROM devices"); MODULE_AUTHOR("Jonathan Naylor G4KLX "); diff -urN -I \$.*\$ --exclude TAGS -X /home/rusty/devel/kernel/kernel-patches/current-dontdiff --minimal working-2.4.14-param/net/rose/af_rose.c working-2.4.14-param-all/net/rose/af_rose.c --- working-2.4.14-param/net/rose/af_rose.c Tue Sep 11 00:58:35 2001 +++ working-2.4.14-param-all/net/rose/af_rose.c Thu Nov 22 08:21:44 2001 @@ -1479,7 +1479,7 @@ EXPORT_NO_SYMBOLS; -MODULE_PARM(rose_ndevs, "i"); +PARAM(rose_ndevs, int, 000); MODULE_PARM_DESC(rose_ndevs, "number of ROSE devices"); MODULE_AUTHOR("Jonathan Naylor G4KLX ");