| Message ID | 001a01ce4ada$e498ace0$adca06a0$@samsung.com |
|---|---|
| State | Deferred, archived |
| Delegated to: | David Miller |
| Headers | show |
On 05/06/2013 11:25 PM, Jingoo Han wrote: > The driver core clears the driver data to NULL after device_release > or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d > (device-core: Ensure drvdata = NULL when no driver is bound). > Thus, it is not needed to manually clear the device driver data to NULL. > > Signed-off-by: Jingoo Han <jg1.han@samsung.com> netdev is closed during the merge window except for fixes, so you will have to resubmit this. But when you do: Acked-by: Rob Herring <rob.herring@calxeda.com> > --- > drivers/net/ethernet/calxeda/xgmac.c | 2 -- > 1 files changed, 0 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c > index 4a1f2fa..7cb148c 100644 > --- a/drivers/net/ethernet/calxeda/xgmac.c > +++ b/drivers/net/ethernet/calxeda/xgmac.c > @@ -1790,7 +1790,6 @@ err_io: > free_netdev(ndev); > err_alloc: > release_mem_region(res->start, resource_size(res)); > - platform_set_drvdata(pdev, NULL); > return ret; > } > > @@ -1813,7 +1812,6 @@ static int xgmac_remove(struct platform_device *pdev) > free_irq(ndev->irq, ndev); > free_irq(priv->pmt_irq, ndev); > > - platform_set_drvdata(pdev, NULL); > unregister_netdev(ndev); > netif_napi_del(&priv->napi); > > -- 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/calxeda/xgmac.c b/drivers/net/ethernet/calxeda/xgmac.c index 4a1f2fa..7cb148c 100644 --- a/drivers/net/ethernet/calxeda/xgmac.c +++ b/drivers/net/ethernet/calxeda/xgmac.c @@ -1790,7 +1790,6 @@ err_io: free_netdev(ndev); err_alloc: release_mem_region(res->start, resource_size(res)); - platform_set_drvdata(pdev, NULL); return ret; } @@ -1813,7 +1812,6 @@ static int xgmac_remove(struct platform_device *pdev) free_irq(ndev->irq, ndev); free_irq(priv->pmt_irq, ndev); - platform_set_drvdata(pdev, NULL); unregister_netdev(ndev); netif_napi_del(&priv->napi);
The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). 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/calxeda/xgmac.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)