Commit dbbf0c91 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Jeff Garzik

MODULE_DESC net drivers cleanup.

Idea is that if there is a valid name in MODULE_DESCRIPTION("...")
then the name of the hardware/driver should not be also repeated
in each MODULE_PARM_DESC("...").  MODULE_DESCRIPTION has been
added to essentially all the 8390 drivers.

All of the drivers changed are 8390 based, with the exception of
eepro100 and 3c509.
parent cd4df93c
......@@ -692,9 +692,11 @@ 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");
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)");
MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
MODULE_PARM_DESC(xcvr, "tranceiver(s) (0=internal, 1=external)");
MODULE_DESCRIPTION("3Com ISA EtherLink II, II/16 (3c503, 3c503/16) driver");
MODULE_LICENSE("GPL");
/* This is set up so that only a single autoprobe takes place per call.
ISA device autoprobes on a running machine are not recommended. */
......@@ -742,7 +744,6 @@ cleanup_module(void)
}
}
#endif /* MODULE */
MODULE_LICENSE("GPL");
/*
......
......@@ -1103,14 +1103,15 @@ MODULE_PARM(debug,"i");
MODULE_PARM(irq,"1-8i");
MODULE_PARM(xcvr,"1-8i");
MODULE_PARM(max_interrupt_work, "i");
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");
MODULE_PARM_DESC(debug, "debug level (0-6)");
MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
MODULE_PARM_DESC(xcvr,"tranceiver(s) (0=internal, 1=external)");
MODULE_PARM_DESC(max_interrupt_work, "maximum events handled per interrupt");
#ifdef __ISAPNP__
MODULE_PARM(nopnp, "i");
MODULE_PARM_DESC(nopnp, "EtherLink III disable ISA PnP support (0-1)");
MODULE_PARM_DESC(nopnp, "disable ISA PnP support (0-1)");
#endif /* __ISAPNP__ */
MODULE_DESCRIPTION("3Com Etherlink III (3c509, 3c509B) ISA/PnP ethernet driver");
int
init_module(void)
......
......@@ -346,9 +346,11 @@ 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");
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)");
MODULE_PARM_DESC(io, "I/O base adress(es)");
MODULE_PARM_DESC(irq, "IRQ number(s)");
MODULE_PARM_DESC(mem, "Memory base address(es)");
MODULE_DESCRIPTION("Ansel AC3200 EISA ethernet driver");
MODULE_LICENSE("GPL");
int
init_module(void)
......@@ -395,7 +397,6 @@ cleanup_module(void)
}
}
#endif /* MODULE */
MODULE_LICENSE("GPL");
/*
......
......@@ -388,10 +388,12 @@ 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");
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)");
MODULE_PARM_DESC(xcvr, "E2100 tranceiver(s) (0=internal, 1=external)");
MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s)");
MODULE_PARM_DESC(mem, " memory base address(es)");
MODULE_PARM_DESC(xcvr, "tranceiver(s) (0=internal, 1=external)");
MODULE_DESCRIPTION("Cabletron E2100 ISA ethernet driver");
MODULE_LICENSE("GPL");
/* This is set up so that only a single autoprobe takes place per call.
ISA device autoprobes on a running machine are not recommended. */
......@@ -440,7 +442,6 @@ cleanup_module(void)
}
}
#endif /* MODULE */
MODULE_LICENSE("GPL");
/*
......
......@@ -130,17 +130,17 @@ MODULE_PARM(rxdmacount, "i");
MODULE_PARM(rx_copybreak, "i");
MODULE_PARM(max_interrupt_work, "i");
MODULE_PARM(multicast_filter_limit, "i");
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)");
MODULE_PARM_DESC(congenb, "eepro100 Enable congestion control (1)");
MODULE_PARM_DESC(txfifo, "eepro100 Tx FIFO threshold in 4 byte units, (0-15)");
MODULE_PARM_DESC(rxfifo, "eepro100 Rx FIFO threshold in 4 byte units, (0-15)");
MODULE_PARM_DESC(txdmaccount, "eepro100 Tx DMA burst length; 128 - disable (0-128)");
MODULE_PARM_DESC(rxdmaccount, "eepro100 Rx DMA burst length; 128 - disable (0-128)");
MODULE_PARM_DESC(rx_copybreak, "eepro100 copy breakpoint for copy-only-tiny-frames");
MODULE_PARM_DESC(max_interrupt_work, "eepro100 maximum events handled per interrupt");
MODULE_PARM_DESC(multicast_filter_limit, "eepro100 maximum number of filtered multicast addresses");
MODULE_PARM_DESC(debug, "debug level (0-6)");
MODULE_PARM_DESC(options, "Bits 0-3: tranceiver type, bit 4: full duplex, bit 5: 100Mbps");
MODULE_PARM_DESC(full_duplex, "full duplex setting(s) (1)");
MODULE_PARM_DESC(congenb, "Enable congestion control (1)");
MODULE_PARM_DESC(txfifo, "Tx FIFO threshold in 4 byte units, (0-15)");
MODULE_PARM_DESC(rxfifo, "Rx FIFO threshold in 4 byte units, (0-15)");
MODULE_PARM_DESC(txdmaccount, "Tx DMA burst length; 128 - disable (0-128)");
MODULE_PARM_DESC(rxdmaccount, "Rx DMA burst length; 128 - disable (0-128)");
MODULE_PARM_DESC(rx_copybreak, "copy breakpoint for copy-only-tiny-frames");
MODULE_PARM_DESC(max_interrupt_work, "maximum events handled per interrupt");
MODULE_PARM_DESC(multicast_filter_limit, "maximum number of filtered multicast addresses");
#define RUN_AT(x) (jiffies + (x))
......
......@@ -383,9 +383,11 @@ 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");
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)");
MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s)");
MODULE_PARM_DESC(mem, "memory base address(es)");
MODULE_DESCRIPTION("Racal-Interlan ES3210 EISA ethernet driver");
MODULE_LICENSE("GPL");
int
init_module(void)
......@@ -429,5 +431,4 @@ cleanup_module(void)
}
}
#endif /* MODULE */
MODULE_LICENSE("GPL");
......@@ -408,8 +408,10 @@ 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");
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");
MODULE_PARM_DESC(io, "I/O port address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s); ignored if properly detected");
MODULE_DESCRIPTION("HP PC-LAN+ ISA ethernet driver");
MODULE_LICENSE("GPL");
/* This is set up so that only a single autoprobe takes place per call.
ISA device autoprobes on a running machine are not recommended. */
......@@ -457,7 +459,6 @@ cleanup_module(void)
}
}
#endif /* MODULE */
MODULE_LICENSE("GPL");
/*
......
......@@ -380,8 +380,10 @@ 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");
MODULE_PARM_DESC(io, "HP PC-LAN I/O base address(es)");
MODULE_PARM_DESC(irq, "HP PC-LAN IRQ number(s) (assigned)");
MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
MODULE_DESCRIPTION("HP PC-LAN ISA ethernet driver");
MODULE_LICENSE("GPL");
/* This is set up so that only a single autoprobe takes place per call.
ISA device autoprobes on a running machine are not recommended. */
......@@ -429,7 +431,6 @@ cleanup_module(void)
}
}
#endif /* MODULE */
MODULE_LICENSE("GPL");
/*
......
......@@ -381,9 +381,10 @@ 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");
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)");
MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s)");
MODULE_PARM_DESC(mem, "memory base address(es)");
MODULE_DESCRIPTION("Mylex LNE390A/B EISA Ethernet driver");
MODULE_LICENSE("GPL");
int init_module(void)
......
......@@ -737,9 +737,11 @@ 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");
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)");
MODULE_PARM_DESC(io, "I/O base address(es),required");
MODULE_PARM_DESC(irq, "IRQ number(s)");
MODULE_PARM_DESC(bad, "Accept card(s) with bad signatures");
MODULE_DESCRIPTION("NE1000/NE2000 ISA/PnP Ethernet driver");
MODULE_LICENSE("GPL");
/* This is set up so that no ISA autoprobe takes place. We can't guarantee
that the ne2k probe is the last 8390 based probe to take place (as it
......@@ -791,7 +793,6 @@ void cleanup_module(void)
}
}
#endif /* MODULE */
MODULE_LICENSE("GPL");
/*
......
......@@ -82,9 +82,9 @@ 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");
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)");
MODULE_PARM_DESC(debug, "debug level (1-2)");
MODULE_PARM_DESC(options, "Bit 5: full duplex");
MODULE_PARM_DESC(full_duplex, "full duplex setting(s) (1)");
/* Some defines that people can play with if so inclined. */
......
......@@ -370,9 +370,11 @@ 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");
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)");
MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s)");
MODULE_PARM_DESC(mem, "memory base address(es)");
MODULE_DESCRIPTION("NE3210 EISA Ethernet driver");
MODULE_LICENSE("GPL");
int init_module(void)
{
......@@ -415,7 +417,6 @@ void cleanup_module(void)
}
}
}
MODULE_LICENSE("GPL");
#endif /* MODULE */
......@@ -501,8 +501,10 @@ 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");
MODULE_PARM_DESC(io, "SMC Ultra I/O base address(es)");
MODULE_PARM_DESC(irq, "SMC Ultra IRQ number(s) (assigned)");
MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s) (assigned)");
MODULE_DESCRIPTION("SMC Ultra/EtherEZ ISA/PnP Ethernet driver");
MODULE_LICENSE("GPL");
EXPORT_NO_SYMBOLS;
......@@ -557,7 +559,6 @@ cleanup_module(void)
}
}
#endif /* MODULE */
MODULE_LICENSE("GPL");
......
......@@ -379,6 +379,9 @@ static void ultra32_block_output(struct net_device *dev,
#define MAX_ULTRA32_CARDS 4 /* Max number of Ultra cards per module */
static struct net_device dev_ultra[MAX_ULTRA32_CARDS];
MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver");
MODULE_LICENSE("GPL");
int init_module(void)
{
int this_dev, found = 0;
......@@ -415,5 +418,4 @@ void cleanup_module(void)
}
}
#endif /* MODULE */
MODULE_LICENSE("GPL");
......@@ -450,10 +450,11 @@ 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");
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)");
MODULE_PARM_DESC(mem_end, "WD80x3 memory end address(es)");
MODULE_PARM_DESC(io, "I/O base address(es)");
MODULE_PARM_DESC(irq, "IRQ number(s) (ignored for PureData boards)");
MODULE_PARM_DESC(mem, "memory base address(es)(ignored for PureData boards)");
MODULE_PARM_DESC(mem_end, "memory end address(es)");
MODULE_DESCRIPTION("ISA Western Digital wd8003/wd8013 ; SMC Elite, Elite16 ethernet driver");
MODULE_LICENSE("GPL");
/* This is set up so that only a single autoprobe takes place per call.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment