diff options
Diffstat (limited to 'drivers/mtd/nand/lpc32xx_slc.c')
-rw-r--r-- | drivers/mtd/nand/lpc32xx_slc.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/nand/lpc32xx_slc.c b/drivers/mtd/nand/lpc32xx_slc.c index be94ed5abefb..add75709d415 100644 --- a/drivers/mtd/nand/lpc32xx_slc.c +++ b/drivers/mtd/nand/lpc32xx_slc.c | |||
@@ -798,7 +798,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) | |||
798 | } | 798 | } |
799 | lpc32xx_wp_disable(host); | 799 | lpc32xx_wp_disable(host); |
800 | 800 | ||
801 | host->pdata = pdev->dev.platform_data; | 801 | host->pdata = dev_get_platdata(&pdev->dev); |
802 | 802 | ||
803 | mtd = &host->mtd; | 803 | mtd = &host->mtd; |
804 | chip = &host->nand_chip; | 804 | chip = &host->nand_chip; |
@@ -936,7 +936,6 @@ err_exit3: | |||
936 | err_exit2: | 936 | err_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); | ||
940 | err_exit1: | 939 | err_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 | ||