Patchwork [17/26] mtd: nand: lpc32xx: remove unnecessary platform_set_drvdata()

login
register
mail settings
Submitter Jingoo Han
Date May 7, 2013, 6:39 a.m.
Message ID <005501ce4aed$981487f0$c83d97d0$@samsung.com>
Download mbox | patch
Permalink /patch/242032/
State Accepted
Commit 6f911f78e631a9bb03f6be4372aa01b36c2460ee
Headers show

Comments

Jingoo Han - May 7, 2013, 6:39 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/mtd/nand/lpc32xx_mlc.c |    2 --
 drivers/mtd/nand/lpc32xx_slc.c |    2 --
 2 files changed, 0 insertions(+), 4 deletions(-)
stigge@antcom.de - May 7, 2013, 4:23 p.m.
On 05/07/2013 08:39 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/mtd/nand/lpc32xx_mlc.c |    2 --
>  drivers/mtd/nand/lpc32xx_slc.c |    2 --
>  2 files changed, 0 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
> index a94facb..5a5cfbc 100644
> --- a/drivers/mtd/nand/lpc32xx_mlc.c
> +++ b/drivers/mtd/nand/lpc32xx_mlc.c
> @@ -833,7 +833,6 @@ err_exit3:
>  err_exit2:
>  	clk_disable(host->clk);
>  	clk_put(host->clk);
> -	platform_set_drvdata(pdev, NULL);
>  err_exit1:
>  	lpc32xx_wp_enable(host);
>  	gpio_free(host->ncfg->wp_gpio);
> @@ -856,7 +855,6 @@ static int lpc32xx_nand_remove(struct platform_device *pdev)
>  
>  	clk_disable(host->clk);
>  	clk_put(host->clk);
> -	platform_set_drvdata(pdev, NULL);
>  
>  	lpc32xx_wp_enable(host);
>  	gpio_free(host->ncfg->wp_gpio);
> diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
> index be94ed5..a66f33f 100644
> --- a/drivers/mtd/nand/lpc32xx_slc.c
> +++ b/drivers/mtd/nand/lpc32xx_slc.c
> @@ -936,7 +936,6 @@ err_exit3:
>  err_exit2:
>  	clk_disable(host->clk);
>  	clk_put(host->clk);
> -	platform_set_drvdata(pdev, NULL);
>  err_exit1:
>  	lpc32xx_wp_enable(host);
>  	gpio_free(host->ncfg->wp_gpio);
> @@ -963,7 +962,6 @@ static int lpc32xx_nand_remove(struct platform_device *pdev)
>  
>  	clk_disable(host->clk);
>  	clk_put(host->clk);
> -	platform_set_drvdata(pdev, NULL);
>  	lpc32xx_wp_enable(host);
>  	gpio_free(host->ncfg->wp_gpio);
>

Patch

diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index a94facb..5a5cfbc 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -833,7 +833,6 @@  err_exit3:
 err_exit2:
 	clk_disable(host->clk);
 	clk_put(host->clk);
-	platform_set_drvdata(pdev, NULL);
 err_exit1:
 	lpc32xx_wp_enable(host);
 	gpio_free(host->ncfg->wp_gpio);
@@ -856,7 +855,6 @@  static int lpc32xx_nand_remove(struct platform_device *pdev)
 
 	clk_disable(host->clk);
 	clk_put(host->clk);
-	platform_set_drvdata(pdev, NULL);
 
 	lpc32xx_wp_enable(host);
 	gpio_free(host->ncfg->wp_gpio);
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index be94ed5..a66f33f 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -936,7 +936,6 @@  err_exit3:
 err_exit2:
 	clk_disable(host->clk);
 	clk_put(host->clk);
-	platform_set_drvdata(pdev, NULL);
 err_exit1:
 	lpc32xx_wp_enable(host);
 	gpio_free(host->ncfg->wp_gpio);
@@ -963,7 +962,6 @@  static int lpc32xx_nand_remove(struct platform_device *pdev)
 
 	clk_disable(host->clk);
 	clk_put(host->clk);
-	platform_set_drvdata(pdev, NULL);
 	lpc32xx_wp_enable(host);
 	gpio_free(host->ncfg->wp_gpio);