Skip to content

Commit

Permalink
[PATCH] smc ethernet: fix section mismatch warnings
Browse files Browse the repository at this point in the history
Priority: not critical; makes init code discardable.
Removes one duplicate assignment.

Fix section mismatch warnings:
WARNING: drivers/net/smc-ultra.o - Section mismatch: reference to .init.text: from .text between 'init_module' (at offset 0x369) and 'cleanup_card'
WARNING: drivers/net/smc-ultra32.o - Section mismatch: reference to .init.text:ultra32_probe from .text between 'init_module' (at offset 0x254) and 'cleanup_module'
WARNING: drivers/net/smc9194.o - Section mismatch: reference to .init.text:smc_init from .text between 'init_module' (at offset 0x997) and 'cleanup_module'
WARNING: drivers/net/smc9194.o - Section mismatch: reference to .init.data: from .data between 'smcdev.0' (at offset 0x44) and '__param_str_io'

Signed-off-by: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Randy Dunlap authored and Jeff Garzik committed Jun 11, 2006
1 parent 29f9f6d commit a2bd2ec
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion drivers/net/smc-ultra.c
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ 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. */
int
int __init
init_module(void)
{
struct net_device *dev;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/smc-ultra32.c
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ static struct net_device *dev_ultra[MAX_ULTRA32_CARDS];
MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver");
MODULE_LICENSE("GPL");

int init_module(void)
int __init init_module(void)
{
int this_dev, found = 0;

Expand Down
7 changes: 2 additions & 5 deletions drivers/net/smc9194.c
Original file line number Diff line number Diff line change
Expand Up @@ -732,12 +732,9 @@ static int ifport;
struct net_device * __init smc_init(int unit)
{
struct net_device *dev = alloc_etherdev(sizeof(struct smc_local));
static struct devlist *smcdev = smc_devlist;
struct devlist *smcdev = smc_devlist;
int err = 0;

#ifndef NO_AUTOPROBE
smcdev = smc_devlist;
#endif
if (!dev)
return ERR_PTR(-ENODEV);

Expand Down Expand Up @@ -1607,7 +1604,7 @@ 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)");

int init_module(void)
int __init init_module(void)
{
if (io == 0)
printk(KERN_WARNING
Expand Down

0 comments on commit a2bd2ec

Please sign in to comment.