| Message ID | 006701ceaec3$dce53e30$96afba90$%han@samsung.com |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Sep 11, 2013 at 12:52 AM, Jingoo Han <jg1.han@samsung.com> wrote: > 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: Jingoo Han <jg1.han@samsung.com> Looks sane to me. Acked-by: Jon Mason <jdmason@kudzu.us> > --- > drivers/net/ethernet/neterion/s2io.c | 2 -- > drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 -- > 2 files changed, 4 deletions(-) > > diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c > index 51b0094..9eeddbd 100644 > --- a/drivers/net/ethernet/neterion/s2io.c > +++ b/drivers/net/ethernet/neterion/s2io.c > @@ -8185,7 +8185,6 @@ mem_alloc_failed: > free_shared_mem(sp); > pci_disable_device(pdev); > pci_release_regions(pdev); > - pci_set_drvdata(pdev, NULL); > free_netdev(dev); > > return ret; > @@ -8221,7 +8220,6 @@ static void s2io_rem_nic(struct pci_dev *pdev) > iounmap(sp->bar0); > iounmap(sp->bar1); > pci_release_regions(pdev); > - pci_set_drvdata(pdev, NULL); > free_netdev(dev); > pci_disable_device(pdev); > } > diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c > index 5a20eaf..8614eeb 100644 > --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c > +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c > @@ -4739,7 +4739,6 @@ _exit6: > _exit5: > vxge_device_unregister(hldev); > _exit4: > - pci_set_drvdata(pdev, NULL); > vxge_hw_device_terminate(hldev); > pci_disable_sriov(pdev); > _exit3: > @@ -4782,7 +4781,6 @@ static void vxge_remove(struct pci_dev *pdev) > vxge_free_mac_add_list(&vdev->vpaths[i]); > > vxge_device_unregister(hldev); > - pci_set_drvdata(pdev, NULL); > /* Do not call pci_disable_sriov here, as it will break child devices */ > vxge_hw_device_terminate(hldev); > iounmap(vdev->bar0); > -- > 1.7.10.4 > > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 51b0094..9eeddbd 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c @@ -8185,7 +8185,6 @@ mem_alloc_failed: free_shared_mem(sp); pci_disable_device(pdev); pci_release_regions(pdev); - pci_set_drvdata(pdev, NULL); free_netdev(dev); return ret; @@ -8221,7 +8220,6 @@ static void s2io_rem_nic(struct pci_dev *pdev) iounmap(sp->bar0); iounmap(sp->bar1); pci_release_regions(pdev); - pci_set_drvdata(pdev, NULL); free_netdev(dev); pci_disable_device(pdev); } diff --git a/drivers/net/ethernet/neterion/vxge/vxge-main.c b/drivers/net/ethernet/neterion/vxge/vxge-main.c index 5a20eaf..8614eeb 100644 --- a/drivers/net/ethernet/neterion/vxge/vxge-main.c +++ b/drivers/net/ethernet/neterion/vxge/vxge-main.c @@ -4739,7 +4739,6 @@ _exit6: _exit5: vxge_device_unregister(hldev); _exit4: - pci_set_drvdata(pdev, NULL); vxge_hw_device_terminate(hldev); pci_disable_sriov(pdev); _exit3: @@ -4782,7 +4781,6 @@ static void vxge_remove(struct pci_dev *pdev) vxge_free_mac_add_list(&vdev->vpaths[i]); vxge_device_unregister(hldev); - pci_set_drvdata(pdev, NULL); /* Do not call pci_disable_sriov here, as it will break child devices */ vxge_hw_device_terminate(hldev); iounmap(vdev->bar0);
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: Jingoo Han <jg1.han@samsung.com> --- drivers/net/ethernet/neterion/s2io.c | 2 -- drivers/net/ethernet/neterion/vxge/vxge-main.c | 2 -- 2 files changed, 4 deletions(-)