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

Commit cb4396ed authored by Fabian Frederick's avatar Fabian Frederick Committed by David S. Miller
Browse files

drivers/net: fix eisa_driver probe section mismatch 



Some eisa_driver structures used __init probe functions which generates
a warning and could crash if function is called after being deleted.

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent cf8190e4

drivers/net/ethernet/3com/3c509.c

+1 −1
Original line number Diff line number Diff line
@@ -562,7 +562,7 @@ static void el3_common_remove (struct net_device *dev) 
}



#ifdef CONFIG_EISA

static int __init el3_eisa_probe (struct device *device)

static int el3_eisa_probe(struct device *device)

{

	short i;

	int ioaddr, irq, if_port;

drivers/net/ethernet/3com/3c59x.c

+1 −1
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ static struct eisa_device_id vortex_eisa_ids[] = { 
};

MODULE_DEVICE_TABLE(eisa, vortex_eisa_ids);



static int __init vortex_eisa_probe(struct device *device)

static int vortex_eisa_probe(struct device *device)

{

	void __iomem *ioaddr;

	struct eisa_device *edev;

drivers/net/ethernet/dec/tulip/de4x5.c

+1 −1
Original line number Diff line number Diff line
@@ -1990,7 +1990,7 @@ SetMulticastFilter(struct net_device *dev) 


static u_char de4x5_irq[] = EISA_ALLOWED_IRQ_LIST;



static int __init de4x5_eisa_probe (struct device *gendev)

static int de4x5_eisa_probe(struct device *gendev)

{

	struct eisa_device *edev;

	u_long iobase;

drivers/net/ethernet/hp/hp100.c

+1 −1
Original line number Diff line number Diff line
@@ -2843,7 +2843,7 @@ static void cleanup_dev(struct net_device *d) 
}



#ifdef CONFIG_EISA

static int __init hp100_eisa_probe (struct device *gendev)

static int hp100_eisa_probe(struct device *gendev)

{

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

	struct eisa_device *edev = to_eisa_device(gendev);