Patchwork [21/36] net: ethernet: nxp: remove unnecessary platform_set_drvdata()

login
register
mail settings
Submitter Jingoo Han
Date May 7, 2013, 4:44 a.m.
Message ID <002601ce4add$888a35b0$999ea110$@samsung.com>
Download mbox | patch
Permalink /patch/241947/
State Deferred
Delegated to: David Miller
Headers show

Comments

Jingoo Han - May 7, 2013, 4:44 a.m.
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/nxp/lpc_eth.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
stigge@antcom.de - May 7, 2013, 4:22 p.m.
On 05/07/2013 06:44 AM, 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>

Tested-by: Roland Stigge <stigge@antcom.de>
Acked-by: Roland Stigge <stigge@antcom.de>

> ---
>  drivers/net/ethernet/nxp/lpc_eth.c |    2 --
>  1 files changed, 0 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
> index 55a5548..a061b93 100644
> --- a/drivers/net/ethernet/nxp/lpc_eth.c
> +++ b/drivers/net/ethernet/nxp/lpc_eth.c
> @@ -1483,7 +1483,6 @@ static int lpc_eth_drv_probe(struct platform_device *pdev)
>  	return 0;
>  
>  err_out_unregister_netdev:
> -	platform_set_drvdata(pdev, NULL);
>  	unregister_netdev(ndev);
>  err_out_dma_unmap:
>  	if (!use_iram_for_net(&pldat->pdev->dev) ||
> @@ -1511,7 +1510,6 @@ static int lpc_eth_drv_remove(struct platform_device *pdev)
>  	struct netdata_local *pldat = netdev_priv(ndev);
>  
>  	unregister_netdev(ndev);
> -	platform_set_drvdata(pdev, NULL);
>  
>  	if (!use_iram_for_net(&pldat->pdev->dev) ||
>  	    pldat->dma_buff_size > lpc32xx_return_iram_size())

--
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

Patch

diff --git a/drivers/net/ethernet/nxp/lpc_eth.c b/drivers/net/ethernet/nxp/lpc_eth.c
index 55a5548..a061b93 100644
--- a/drivers/net/ethernet/nxp/lpc_eth.c
+++ b/drivers/net/ethernet/nxp/lpc_eth.c
@@ -1483,7 +1483,6 @@  static int lpc_eth_drv_probe(struct platform_device *pdev)
 	return 0;
 
 err_out_unregister_netdev:
-	platform_set_drvdata(pdev, NULL);
 	unregister_netdev(ndev);
 err_out_dma_unmap:
 	if (!use_iram_for_net(&pldat->pdev->dev) ||
@@ -1511,7 +1510,6 @@  static int lpc_eth_drv_remove(struct platform_device *pdev)
 	struct netdata_local *pldat = netdev_priv(ndev);
 
 	unregister_netdev(ndev);
-	platform_set_drvdata(pdev, NULL);
 
 	if (!use_iram_for_net(&pldat->pdev->dev) ||
 	    pldat->dma_buff_size > lpc32xx_return_iram_size())