Skip to content

Commit

Permalink
via-velocity: 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>
Cc: David Lv <DavidLv@viatech.com.cn>
  • Loading branch information
Francois Romieu committed Apr 7, 2012
1 parent 0ca0aa0 commit dfda357
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions drivers/net/ethernet/via/via-velocity.c
Original file line number Diff line number Diff line change
Expand Up @@ -2488,8 +2488,8 @@ static int velocity_close(struct net_device *dev)

if (vptr->flags & VELOCITY_FLAGS_WOL_ENABLED)
velocity_get_ip(vptr);
if (dev->irq != 0)
free_irq(dev->irq, dev);

free_irq(vptr->pdev->irq, dev);

velocity_free_rings(vptr);

Expand Down Expand Up @@ -2755,8 +2755,6 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi
if (ret < 0)
goto err_free_dev;

dev->irq = pdev->irq;

ret = velocity_get_pci_info(vptr, pdev);
if (ret < 0) {
/* error message already printed */
Expand All @@ -2779,8 +2777,6 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi

mac_wol_reset(regs);

dev->base_addr = vptr->ioaddr;

for (i = 0; i < 6; i++)
dev->dev_addr[i] = readb(&regs->PAR[i]);

Expand All @@ -2806,7 +2802,6 @@ static int __devinit velocity_found1(struct pci_dev *pdev, const struct pci_devi

vptr->phy_id = MII_GET_PHY_ID(vptr->mac_regs);

dev->irq = pdev->irq;
dev->netdev_ops = &velocity_netdev_ops;
dev->ethtool_ops = &velocity_ethtool_ops;
netif_napi_add(dev, &vptr->napi, velocity_poll, VELOCITY_NAPI_WEIGHT);
Expand Down

0 comments on commit dfda357

Please sign in to comment.