Skip to content

Commit

Permalink
hamachi: stop using net_device.{base_addr, irq}.
Browse files Browse the repository at this point in the history
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
  • Loading branch information
Francois Romieu committed Apr 7, 2012
1 parent 05d334e commit 0ca0aa0
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions drivers/net/ethernet/packetengines/hamachi.c
Original file line number Diff line number Diff line change
Expand Up @@ -683,8 +683,6 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
}

hmp->base = ioaddr;
dev->base_addr = (unsigned long)ioaddr;
dev->irq = irq;
pci_set_drvdata(pdev, dev);

hmp->chip_id = chip_id;
Expand Down Expand Up @@ -859,14 +857,11 @@ static int hamachi_open(struct net_device *dev)
u32 rx_int_var, tx_int_var;
u16 fifo_info;

i = request_irq(dev->irq, hamachi_interrupt, IRQF_SHARED, dev->name, dev);
i = request_irq(hmp->pci_dev->irq, hamachi_interrupt, IRQF_SHARED,
dev->name, dev);
if (i)
return i;

if (hamachi_debug > 1)
printk(KERN_DEBUG "%s: hamachi_open() irq %d.\n",
dev->name, dev->irq);

hamachi_init_ring(dev);

#if ADDRLEN == 64
Expand Down Expand Up @@ -1705,7 +1700,7 @@ static int hamachi_close(struct net_device *dev)
}
#endif /* __i386__ debugging only */

free_irq(dev->irq, dev);
free_irq(hmp->pci_dev->irq, dev);

del_timer_sync(&hmp->timer);

Expand Down

0 comments on commit 0ca0aa0

Please sign in to comment.