Skip to content

Commit

Permalink
drivers/net: fix eisa_driver probe section mismatch
Browse files Browse the repository at this point in the history
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: Fabian Frederick <fabf@skynet.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Fabian Frederick authored and David S. Miller committed Dec 14, 2015
1 parent cf8190e commit cb4396e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/3com/3c509.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/3com/3c59x.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/dec/tulip/de4x5.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/ethernet/hp/hp100.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit cb4396e

Please sign in to comment.