Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a2bd2ec8d1bef7479d26d375162963106757e8e9

Authored by Randy Dunlap
Committed by Jeff Garzik
1 parent 29f9f6d234
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[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: Randy Dunlap <rdunlap@xenotime.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

Showing 3 changed files with 4 additions and 7 deletions Side-by-side Diff

drivers/net/smc-ultra.c
Diff comments   View file @ a2bd2ec
... ... @@ -553,7 +553,7 @@
553 553  
554 554 /* This is set up so that only a single autoprobe takes place per call.
555 555 ISA device autoprobes on a running machine are not recommended. */
556   -int
  556 +int __init
557 557 init_module(void)
558 558 {
559 559 struct net_device *dev;
drivers/net/smc-ultra32.c
Diff comments   View file @ a2bd2ec
... ... @@ -421,7 +421,7 @@
421 421 MODULE_DESCRIPTION("SMC Ultra32 EISA ethernet driver");
422 422 MODULE_LICENSE("GPL");
423 423  
424   -int init_module(void)
  424 +int __init init_module(void)
425 425 {
426 426 int this_dev, found = 0;
427 427  
drivers/net/smc9194.c
Diff comments   View file @ a2bd2ec
... ... @@ -732,12 +732,9 @@
732 732 struct net_device * __init smc_init(int unit)
733 733 {
734 734 struct net_device *dev = alloc_etherdev(sizeof(struct smc_local));
735   - static struct devlist *smcdev = smc_devlist;
  735 + struct devlist *smcdev = smc_devlist;
736 736 int err = 0;
737 737  
738   -#ifndef NO_AUTOPROBE
739   - smcdev = smc_devlist;
740   -#endif
741 738 if (!dev)
742 739 return ERR_PTR(-ENODEV);
743 740  
... ... @@ -1607,7 +1604,7 @@
1607 1604 MODULE_PARM_DESC(irq, "SMC 99194 IRQ number");
1608 1605 MODULE_PARM_DESC(ifport, "SMC 99194 interface port (0-default, 1-TP, 2-AUI)");
1609 1606  
1610   -int init_module(void)
  1607 +int __init init_module(void)
1611 1608 {
1612 1609 if (io == 0)
1613 1610 printk(KERN_WARNING