3c59x: Fix several modpost warnings
Subsystems (2)
WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4580) and 'vortex_eisa_remove'
WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4584) and 'vortex_eisa_remove'
WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x4588) and 'vortex_eisa_remove'
WARNING: drivers/net/3c59x.o - Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset 0x458c) and 'vortex_eisa_remove'
Fixed by:
o move definition of vortex_eisa_driver below the functions it references.
o remove now unnecessary prototypes for vortex_eisa_probe and vortex_eisa_remove.
o Make vortex_eisa_probe an __init function.
o Make vortex_eisa_remove a __devexit function.
o Wrap vortex_eisa_driver reference to vortex_eisa_remove with __devexit_p().
drivers/net/3c59x.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/net/3c59x.c +13 -15
@@ -858,19 +858,7 @@ static struct eisa_device_id vortex_eisa };MODULE_DEVICE_TABLE (eisa, vortex_eisa_ids); -static int vortex_eisa_probe (struct device *device); -static int vortex_eisa_remove (struct device *device); - -static struct eisa_driver vortex_eisa_driver = { - .id_table = vortex_eisa_ids, - .driver = { - .name ="3c59x" , - .probe = vortex_eisa_probe, - .remove = vortex_eisa_remove - } -}; - -static int vortex_eisa_probe (struct device *device) +static int __init vortex_eisa_probe (struct device *device) {void __iomem *ioaddr;struct eisa_device *edev;
@@ -893,7 +881,7 @@ static int vortex_eisa_probe(struct devireturn 0 ; } -static int vortex_eisa_remove (struct device *device) +static int __devexit vortex_eisa_remove(struct device *device) {struct eisa_device *edev;struct net_device *dev;
@@ -918,7 +906,17 @@ static int vortex_eisa_remove(struct devfree_netdev (dev); return 0; } -#endif + +static struct eisa_driver vortex_eisa_driver = { + .id_table = vortex_eisa_ids, + .driver = { + .name ="3c59x" , + .probe = vortex_eisa_probe, + .remove =__devexit_p (vortex_eisa_remove) + } +}; + +#endif /* CONFIG_EISA */ /* returns count found (>= 0), or negative on error */ static int __init vortex_eisa_init (void )
Quoted 15 lines · Ralf Baechle
WARNING:
drivers/net/3c59x.o- Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset0x4580) and 'vortex_eisa_remove'
WARNING:drivers/net/3c59x.o- Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset0x4584) and 'vortex_eisa_remove'
WARNING:drivers/net/3c59x.o- Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset0x4588) and 'vortex_eisa_remove'
WARNING:drivers/net/3c59x.o- Section mismatch: reference to .init.text: from .text between 'vortex_eisa_probe' (at offset0x458c) and 'vortex_eisa_remove'Fixed by:
o move definition of
vortex_eisa_driverbelow the functions it references.
o remove now unnecessary prototypes forvortex_eisa_probeandvortex_eisa_remove.
o Makevortex_eisa_probean__initfunction.
o Makevortex_eisa_removea__devexitfunction.
o Wrapvortex_eisa_driverreference tovortex_eisa_removewith__devexit_p().
Quoted 4 lines
Signed-off-by Ralf Baechle <[email protected]>drivers/net/3c59x.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
applied this and ibmtr patch