| Message ID | 00be01cecb98$8cabcd20$a6036760$%han@samsung.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
This looks good to me. Regards, -Sujith On 18/10/13 5:55 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> >--- > drivers/net/ethernet/cisco/enic/enic_main.c | 2 -- > 1 file changed, 2 deletions(-) > >diff --git a/drivers/net/ethernet/cisco/enic/enic_main.c >b/drivers/net/ethernet/cisco/enic/enic_main.c >index 7b756cf9..ff78dfa 100644 >--- a/drivers/net/ethernet/cisco/enic/enic_main.c >+++ b/drivers/net/ethernet/cisco/enic/enic_main.c >@@ -2309,7 +2309,6 @@ err_out_release_regions: > err_out_disable_device: > pci_disable_device(pdev); > err_out_free_netdev: >- pci_set_drvdata(pdev, NULL); > free_netdev(netdev); > > return err; >@@ -2338,7 +2337,6 @@ static void enic_remove(struct pci_dev *pdev) > enic_iounmap(enic); > pci_release_regions(pdev); > pci_disable_device(pdev); >- pci_set_drvdata(pdev, NULL); > free_netdev(netdev); > } > } >-- >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/cisco/enic/enic_main.c b/drivers/net/ethernet/cisco/enic/enic_main.c index 7b756cf9..ff78dfa 100644 --- a/drivers/net/ethernet/cisco/enic/enic_main.c +++ b/drivers/net/ethernet/cisco/enic/enic_main.c @@ -2309,7 +2309,6 @@ err_out_release_regions: err_out_disable_device: pci_disable_device(pdev); err_out_free_netdev: - pci_set_drvdata(pdev, NULL); free_netdev(netdev); return err; @@ -2338,7 +2337,6 @@ static void enic_remove(struct pci_dev *pdev) enic_iounmap(enic); pci_release_regions(pdev); pci_disable_device(pdev); - pci_set_drvdata(pdev, NULL); free_netdev(netdev); } }
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/cisco/enic/enic_main.c | 2 -- 1 file changed, 2 deletions(-)