Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2bd2ec8 authored by Randy Dunlap's avatar Randy Dunlap Committed by Jeff Garzik
Browse files

[PATCH] smc ethernet: fix section mismatch warnings 



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: default avatarRandy Dunlap <rdunlap@xenotime.net>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 29f9f6d2

drivers/net/smc-ultra.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -553,7 +553,7 @@ MODULE_LICENSE("GPL"); 




/* This is set up so that only a single autoprobe takes place per call.

/* This is set up so that only a single autoprobe takes place per call.

ISA device autoprobes on a running machine are not recommended. */

ISA device autoprobes on a running machine are not recommended. */

int

int __init

init_module(void)

init_module(void)

{

{

	struct net_device *dev;

	struct net_device *dev;

drivers/net/smc-ultra32.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -421,7 +421,7 @@ static struct net_device *dev_ultra[MAX_ULTRA32_CARDS]; 
MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver");

MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver");

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");





int init_module(void)

int __init init_module(void)

{

{

	int this_dev, found = 0;

	int this_dev, found = 0;

drivers/net/smc9194.c

+2 −5
Original line number Original line Diff line number Diff line
@@ -732,12 +732,9 @@ static int ifport; 
struct net_device * __init smc_init(int unit)

struct net_device * __init smc_init(int unit)

{

{

	struct net_device *dev = alloc_etherdev(sizeof(struct smc_local));

	struct net_device *dev = alloc_etherdev(sizeof(struct smc_local));

	static struct devlist *smcdev = smc_devlist;

	struct devlist *smcdev = smc_devlist;

	int err = 0;

	int err = 0;





#ifndef NO_AUTOPROBE

	smcdev = smc_devlist;

#endif

	if (!dev)

	if (!dev)

		return ERR_PTR(-ENODEV);

		return ERR_PTR(-ENODEV);
@@ -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(irq, "SMC 99194 IRQ number");

MODULE_PARM_DESC(ifport, "SMC 99194 interface port (0-default, 1-TP, 2-AUI)");

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)

	if (io == 0)

		printk(KERN_WARNING

		printk(KERN_WARNING