aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/vxge
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2010-11-15 05:13:58 -0500
committerDavid S. Miller <davem@davemloft.net>2010-11-17 15:25:56 -0500
commitd8ee707114bc3615fd7be90eb942eba2dbe668ed (patch)
tree2742739239b66b834d1f96742bd3cc6c8a2d3128 /drivers/net/vxge
parenta31ff3880578c37fd5c71ee863c23897dacfa9f8 (diff)
drivers/net/vxge/vxge-main.c: Remove unnecessary casts of pci_get_drvdata
Signed-off-by: Joe Perches <joe@perches.com> Acked-by: Jon Mason <jon.mason@exar.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vxge')
-rw-r--r--drivers/net/vxge/vxge-main.c28
1 files changed, 12 insertions, 16 deletions
diff --git a/drivers/net/vxge/vxge-main.c b/drivers/net/vxge/vxge-main.c
index 29f0ec88cfe..5cba4a684f0 100644
--- a/drivers/net/vxge/vxge-main.c
+++ b/drivers/net/vxge/vxge-main.c
@@ -688,7 +688,7 @@ static int vxge_learn_mac(struct vxgedev *vdev, u8 *mac_header)
688 struct vxge_vpath *vpath = NULL; 688 struct vxge_vpath *vpath = NULL;
689 struct __vxge_hw_device *hldev; 689 struct __vxge_hw_device *hldev;
690 690
691 hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev); 691 hldev = pci_get_drvdata(vdev->pdev);
692 692
693 mac_address = (u8 *)&mac_addr; 693 mac_address = (u8 *)&mac_addr;
694 memcpy(mac_address, mac_header, ETH_ALEN); 694 memcpy(mac_address, mac_header, ETH_ALEN);
@@ -1313,7 +1313,7 @@ static void vxge_vpath_intr_disable(struct vxgedev *vdev, int vp_id)
1313 struct __vxge_hw_device *hldev; 1313 struct __vxge_hw_device *hldev;
1314 int msix_id; 1314 int msix_id;
1315 1315
1316 hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev); 1316 hldev = pci_get_drvdata(vdev->pdev);
1317 1317
1318 vxge_hw_vpath_wait_receive_idle(hldev, vpath->device_id); 1318 vxge_hw_vpath_wait_receive_idle(hldev, vpath->device_id);
1319 1319
@@ -1632,8 +1632,7 @@ static int vxge_poll_inta(struct napi_struct *napi, int budget)
1632 int budget_org = budget; 1632 int budget_org = budget;
1633 struct vxge_ring *ring; 1633 struct vxge_ring *ring;
1634 1634
1635 struct __vxge_hw_device *hldev = (struct __vxge_hw_device *) 1635 struct __vxge_hw_device *hldev = pci_get_drvdata(vdev->pdev);
1636 pci_get_drvdata(vdev->pdev);
1637 1636
1638 for (i = 0; i < vdev->no_of_vpath; i++) { 1637 for (i = 0; i < vdev->no_of_vpath; i++) {
1639 ring = &vdev->vpaths[i].ring; 1638 ring = &vdev->vpaths[i].ring;
@@ -1673,7 +1672,7 @@ static void vxge_netpoll(struct net_device *dev)
1673 struct vxgedev *vdev; 1672 struct vxgedev *vdev;
1674 1673
1675 vdev = netdev_priv(dev); 1674 vdev = netdev_priv(dev);
1676 hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev); 1675 hldev = pci_get_drvdata(vdev->pdev);
1677 1676
1678 vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__); 1677 vxge_debug_entryexit(VXGE_TRACE, "%s:%d", __func__, __LINE__);
1679 1678
@@ -2107,7 +2106,7 @@ static irqreturn_t vxge_isr_napi(int irq, void *dev_id)
2107 vxge_debug_intr(VXGE_TRACE, "%s:%d", __func__, __LINE__); 2106 vxge_debug_intr(VXGE_TRACE, "%s:%d", __func__, __LINE__);
2108 2107
2109 dev = vdev->ndev; 2108 dev = vdev->ndev;
2110 hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev); 2109 hldev = pci_get_drvdata(vdev->pdev);
2111 2110
2112 if (pci_channel_offline(vdev->pdev)) 2111 if (pci_channel_offline(vdev->pdev))
2113 return IRQ_NONE; 2112 return IRQ_NONE;
@@ -2342,7 +2341,7 @@ static void vxge_rem_msix_isr(struct vxgedev *vdev)
2342static void vxge_rem_isr(struct vxgedev *vdev) 2341static void vxge_rem_isr(struct vxgedev *vdev)
2343{ 2342{
2344 struct __vxge_hw_device *hldev; 2343 struct __vxge_hw_device *hldev;
2345 hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev); 2344 hldev = pci_get_drvdata(vdev->pdev);
2346 2345
2347#ifdef CONFIG_PCI_MSI 2346#ifdef CONFIG_PCI_MSI
2348 if (vdev->config.intr_type == MSI_X) { 2347 if (vdev->config.intr_type == MSI_X) {
@@ -2583,7 +2582,7 @@ vxge_open(struct net_device *dev)
2583 "%s: %s:%d", dev->name, __func__, __LINE__); 2582 "%s: %s:%d", dev->name, __func__, __LINE__);
2584 2583
2585 vdev = netdev_priv(dev); 2584 vdev = netdev_priv(dev);
2586 hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev); 2585 hldev = pci_get_drvdata(vdev->pdev);
2587 function_mode = vdev->config.device_hw_info.function_mode; 2586 function_mode = vdev->config.device_hw_info.function_mode;
2588 2587
2589 /* make sure you have link off by default every time Nic is 2588 /* make sure you have link off by default every time Nic is
@@ -2811,7 +2810,7 @@ static int do_vxge_close(struct net_device *dev, int do_io)
2811 dev->name, __func__, __LINE__); 2810 dev->name, __func__, __LINE__);
2812 2811
2813 vdev = netdev_priv(dev); 2812 vdev = netdev_priv(dev);
2814 hldev = (struct __vxge_hw_device *)pci_get_drvdata(vdev->pdev); 2813 hldev = pci_get_drvdata(vdev->pdev);
2815 2814
2816 if (unlikely(!is_vxge_card_up(vdev))) 2815 if (unlikely(!is_vxge_card_up(vdev)))
2817 return 0; 2816 return 0;
@@ -3985,8 +3984,7 @@ static int vxge_pm_resume(struct pci_dev *pdev)
3985static pci_ers_result_t vxge_io_error_detected(struct pci_dev *pdev, 3984static pci_ers_result_t vxge_io_error_detected(struct pci_dev *pdev,
3986 pci_channel_state_t state) 3985 pci_channel_state_t state)
3987{ 3986{
3988 struct __vxge_hw_device *hldev = 3987 struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
3989 (struct __vxge_hw_device *)pci_get_drvdata(pdev);
3990 struct net_device *netdev = hldev->ndev; 3988 struct net_device *netdev = hldev->ndev;
3991 3989
3992 netif_device_detach(netdev); 3990 netif_device_detach(netdev);
@@ -4015,8 +4013,7 @@ static pci_ers_result_t vxge_io_error_detected(struct pci_dev *pdev,
4015 */ 4013 */
4016static pci_ers_result_t vxge_io_slot_reset(struct pci_dev *pdev) 4014static pci_ers_result_t vxge_io_slot_reset(struct pci_dev *pdev)
4017{ 4015{
4018 struct __vxge_hw_device *hldev = 4016 struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
4019 (struct __vxge_hw_device *)pci_get_drvdata(pdev);
4020 struct net_device *netdev = hldev->ndev; 4017 struct net_device *netdev = hldev->ndev;
4021 4018
4022 struct vxgedev *vdev = netdev_priv(netdev); 4019 struct vxgedev *vdev = netdev_priv(netdev);
@@ -4041,8 +4038,7 @@ static pci_ers_result_t vxge_io_slot_reset(struct pci_dev *pdev)
4041 */ 4038 */
4042static void vxge_io_resume(struct pci_dev *pdev) 4039static void vxge_io_resume(struct pci_dev *pdev)
4043{ 4040{
4044 struct __vxge_hw_device *hldev = 4041 struct __vxge_hw_device *hldev = pci_get_drvdata(pdev);
4045 (struct __vxge_hw_device *)pci_get_drvdata(pdev);
4046 struct net_device *netdev = hldev->ndev; 4042 struct net_device *netdev = hldev->ndev;
4047 4043
4048 if (netif_running(netdev)) { 4044 if (netif_running(netdev)) {
@@ -4689,7 +4685,7 @@ static void __devexit vxge_remove(struct pci_dev *pdev)
4689 struct net_device *dev; 4685 struct net_device *dev;
4690 int i = 0; 4686 int i = 0;
4691 4687
4692 hldev = (struct __vxge_hw_device *)pci_get_drvdata(pdev); 4688 hldev = pci_get_drvdata(pdev);
4693 4689
4694 if (hldev == NULL) 4690 if (hldev == NULL)
4695 return; 4691 return;