Commit 133432a7 authored by Jingoo Han's avatar Jingoo Han Committed by Brian Norris

mtd: lpc32xx_slc: Use devm_*() functions

Use devm_*() functions to make cleanup paths simpler.
Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Acked-by: default avatarRoland Stigge <stigge@antcom.de>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 2281f7b6
...@@ -791,8 +791,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) ...@@ -791,8 +791,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
} }
if (host->ncfg->wp_gpio == -EPROBE_DEFER) if (host->ncfg->wp_gpio == -EPROBE_DEFER)
return -EPROBE_DEFER; return -EPROBE_DEFER;
if (gpio_is_valid(host->ncfg->wp_gpio) && if (gpio_is_valid(host->ncfg->wp_gpio) && devm_gpio_request(&pdev->dev,
gpio_request(host->ncfg->wp_gpio, "NAND WP")) { host->ncfg->wp_gpio, "NAND WP")) {
dev_err(&pdev->dev, "GPIO not available\n"); dev_err(&pdev->dev, "GPIO not available\n");
return -EBUSY; return -EBUSY;
} }
...@@ -808,7 +808,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) ...@@ -808,7 +808,7 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
mtd->dev.parent = &pdev->dev; mtd->dev.parent = &pdev->dev;
/* Get NAND clock */ /* Get NAND clock */
host->clk = clk_get(&pdev->dev, NULL); host->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(host->clk)) { if (IS_ERR(host->clk)) {
dev_err(&pdev->dev, "Clock failure\n"); dev_err(&pdev->dev, "Clock failure\n");
res = -ENOENT; res = -ENOENT;
...@@ -927,10 +927,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev) ...@@ -927,10 +927,8 @@ static int lpc32xx_nand_probe(struct platform_device *pdev)
dma_release_channel(host->dma_chan); dma_release_channel(host->dma_chan);
err_exit2: err_exit2:
clk_disable(host->clk); clk_disable(host->clk);
clk_put(host->clk);
err_exit1: err_exit1:
lpc32xx_wp_enable(host); lpc32xx_wp_enable(host);
gpio_free(host->ncfg->wp_gpio);
return res; return res;
} }
...@@ -953,9 +951,7 @@ static int lpc32xx_nand_remove(struct platform_device *pdev) ...@@ -953,9 +951,7 @@ static int lpc32xx_nand_remove(struct platform_device *pdev)
writel(tmp, SLC_CTRL(host->io_base)); writel(tmp, SLC_CTRL(host->io_base));
clk_disable(host->clk); clk_disable(host->clk);
clk_put(host->clk);
lpc32xx_wp_enable(host); lpc32xx_wp_enable(host);
gpio_free(host->ncfg->wp_gpio);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment