aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJingoo Han <jg1.han@samsung.com>2013-05-07 02:39:15 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2013-08-05 15:59:06 -0400
commit6f911f78e631a9bb03f6be4372aa01b36c2460ee (patch)
tree4d92bf0078695f4cb629339564e624ffe583a403
parent1b03147277e38ef0cbe0f92bc2b908c7419b55ea (diff)
mtd: nand: lpc32xx: remove unnecessary platform_set_drvdata()
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> Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
-rw-r--r--drivers/mtd/nand/lpc32xx_mlc.c2
-rw-r--r--drivers/mtd/nand/lpc32xx_slc.c2
2 files changed, 0 insertions, 4 deletions
diff --git a/drivers/mtd/nand/lpc32xx_mlc.c b/drivers/mtd/nand/lpc32xx_mlc.c
index fd1df5e13ae4..74a469b83c0d 100644
--- a/drivers/mtd/nand/lpc32xx_mlc.c
+++ b/drivers/mtd/nand/lpc32xx_mlc.c
@@ -828,7 +828,6 @@ err_exit3:
828err_exit2: 828err_exit2:
829 clk_disable(host->clk); 829 clk_disable(host->clk);
830 clk_put(host->clk); 830 clk_put(host->clk);
831 platform_set_drvdata(pdev, NULL);
832err_exit1: 831err_exit1:
833 lpc32xx_wp_enable(host); 832 lpc32xx_wp_enable(host);
834 gpio_free(host->ncfg->wp_gpio); 833 gpio_free(host->ncfg->wp_gpio);
@@ -851,7 +850,6 @@ static int lpc32xx_nand_remove(struct platform_device *pdev)
851 850
852 clk_disable(host->clk); 851 clk_disable(host->clk);
853 clk_put(host->clk); 852 clk_put(host->clk);
854 platform_set_drvdata(pdev, NULL);
855 853
856 lpc32xx_wp_enable(host); 854 lpc32xx_wp_enable(host);
857 gpio_free(host->ncfg->wp_gpio); 855 gpio_free(host->ncfg->wp_gpio);
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c
index be94ed5abefb..a66f33f25974 100644
--- a/drivers/mtd/nand/lpc32xx_slc.c
+++ b/drivers/mtd/nand/lpc32xx_slc.c
@@ -936,7 +936,6 @@ err_exit3:
936err_exit2: 936err_exit2:
937 clk_disable(host->clk); 937 clk_disable(host->clk);
938 clk_put(host->clk); 938 clk_put(host->clk);
939 platform_set_drvdata(pdev, NULL);
940err_exit1: 939err_exit1:
941 lpc32xx_wp_enable(host); 940 lpc32xx_wp_enable(host);
942 gpio_free(host->ncfg->wp_gpio); 941 gpio_free(host->ncfg->wp_gpio);
@@ -963,7 +962,6 @@ static int lpc32xx_nand_remove(struct platform_device *pdev)
963 962
964 clk_disable(host->clk); 963 clk_disable(host->clk);
965 clk_put(host->clk); 964 clk_put(host->clk);
966 platform_set_drvdata(pdev, NULL);
967 lpc32xx_wp_enable(host); 965 lpc32xx_wp_enable(host);
968 gpio_free(host->ncfg->wp_gpio); 966 gpio_free(host->ncfg->wp_gpio);
969 967