Commit 4f12b2f5 authored by Jingoo Han's avatar Jingoo Han Committed by David S. Miller

net: neterion: remove unnecessary pci_set_drvdata()

The driver core clears the driver data to NULL after device_release
or on probe failure. Thus, it is not needed to manually clear the
device driver data to NULL.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarJon Mason <jdmason@kudzu.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e146aaa6
...@@ -8185,7 +8185,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre) ...@@ -8185,7 +8185,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
free_shared_mem(sp); free_shared_mem(sp);
pci_disable_device(pdev); pci_disable_device(pdev);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_set_drvdata(pdev, NULL);
free_netdev(dev); free_netdev(dev);
return ret; return ret;
...@@ -8221,7 +8220,6 @@ static void s2io_rem_nic(struct pci_dev *pdev) ...@@ -8221,7 +8220,6 @@ static void s2io_rem_nic(struct pci_dev *pdev)
iounmap(sp->bar0); iounmap(sp->bar0);
iounmap(sp->bar1); iounmap(sp->bar1);
pci_release_regions(pdev); pci_release_regions(pdev);
pci_set_drvdata(pdev, NULL);
free_netdev(dev); free_netdev(dev);
pci_disable_device(pdev); pci_disable_device(pdev);
} }
......
...@@ -4739,7 +4739,6 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre) ...@@ -4739,7 +4739,6 @@ vxge_probe(struct pci_dev *pdev, const struct pci_device_id *pre)
_exit5: _exit5:
vxge_device_unregister(hldev); vxge_device_unregister(hldev);
_exit4: _exit4:
pci_set_drvdata(pdev, NULL);
vxge_hw_device_terminate(hldev); vxge_hw_device_terminate(hldev);
pci_disable_sriov(pdev); pci_disable_sriov(pdev);
_exit3: _exit3:
...@@ -4782,7 +4781,6 @@ static void vxge_remove(struct pci_dev *pdev) ...@@ -4782,7 +4781,6 @@ static void vxge_remove(struct pci_dev *pdev)
vxge_free_mac_add_list(&vdev->vpaths[i]); vxge_free_mac_add_list(&vdev->vpaths[i]);
vxge_device_unregister(hldev); vxge_device_unregister(hldev);
pci_set_drvdata(pdev, NULL);
/* Do not call pci_disable_sriov here, as it will break child devices */ /* Do not call pci_disable_sriov here, as it will break child devices */
vxge_hw_device_terminate(hldev); vxge_hw_device_terminate(hldev);
iounmap(vdev->bar0); iounmap(vdev->bar0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment