3c59x: Fix several modpost warnings
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(). Signed-off-by: Ralf Baechle <ralf@linux-mips.org> drivers/net/3c59x.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
fe79745507
commit
95c408a95f
|
@ -858,19 +858,7 @@ static struct eisa_device_id vortex_eisa_ids[] = {
|
|||
};
|
||||
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 device *device)
|
|||
return 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 device *device)
|
|||
free_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)
|
||||
|
|
Loading…
Reference in New Issue