leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vxge: stop using net_device.{base_addr, irq}.

Browse Source 
Signed-off-by: Francois Romieu <romieu@fr.zoreil.com>
Cc: Jon Mason <jdmason@kudzu.us>
This commit is contained in:
Francois Romieu 2012-03-09 19:37:55 +01:00
parent c514f285c3
commit 32e819e46e
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/net/ethernet/neterion/vxge/vxge-main.c
View File

@ -1882,25 +1882,24 @@ static int vxge_poll_inta(struct napi_struct *napi, int budget)
*/ */
static void vxge_netpoll(struct net_device *dev) static void vxge_netpoll(struct net_device *dev)
{ {
struct __vxge_hw_device *hldev; struct vxgedev *vdev = netdev_priv(dev);
struct vxgedev *vdev; struct pci_dev *pdev = vdev->pdev;
struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
vdev = netdev_priv(dev); const int irq = pdev->irq;
hldev = pci_get_drvdata(vdev->pdev);
vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__); vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__);
if (pci_channel_offline(vdev->pdev)) if (pci_channel_offline(pdev))
return; return;
disable_irq(dev->irq); disable_irq(irq);
vxge_hw_device_clear_tx_rx(hldev); vxge_hw_device_clear_tx_rx(hldev);
vxge_hw_device_clear_tx_rx(hldev); vxge_hw_device_clear_tx_rx(hldev);
VXGE_COMPLETE_ALL_RX(vdev); VXGE_COMPLETE_ALL_RX(vdev);
VXGE_COMPLETE_ALL_TX(vdev); VXGE_COMPLETE_ALL_TX(vdev);
enable_irq(dev->irq); enable_irq(irq);
vxge_debug_entryexit(VXGE_TRACE, vxge_debug_entryexit(VXGE_TRACE,
"%s:%d Exiting...", __func__, __LINE__); "%s:%d Exiting...", __func__, __LINE__);
@ -3424,9 +3423,6 @@ static int __devinit vxge_device_register(struct __vxge_hw_device *hldev,
ndev->features |= ndev->hw_features | ndev->features |= ndev->hw_features |
NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER; NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER;
/* Driver entry points */
ndev->irq = vdev->pdev->irq;
ndev->base_addr = (unsigned long) hldev->bar0;
ndev->netdev_ops = &vxge_netdev_ops; ndev->netdev_ops = &vxge_netdev_ops;