nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

mmc: mxs-mmc: use devm_* helper to make cleanup simpler

Browse source 
Use devm_request_and_ioremap and devm_request_irq helpers to clean up
the code a little bit.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Marek Vasut <marex@denx.de>
Acked-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Shawn Guo 2012-05-06 11:20:40 +08:00
parent 81f38ee8e6
commit df06bfc724
1 changed files with 9 additions and 31 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/mmc/host/mxs-mmc.c
View file

@ -146,8 +146,6 @@ struct mxs_mmc_host {
struct mmc_data *data; struct mmc_data *data;
void __iomem *base; void __iomem *base;
int irq;
struct resource *res;
struct resource *dma_res; struct resource *dma_res;
struct clk *clk; struct clk *clk;
unsigned int clk_rate; unsigned int clk_rate;
@ -695,7 +693,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
{ {
struct mxs_mmc_host *host; struct mxs_mmc_host *host;
struct mmc_host *mmc; struct mmc_host *mmc;
struct resource *iores, *dmares, *r; struct resource *iores, *dmares;
struct mxs_mmc_platform_data *pdata; struct mxs_mmc_platform_data *pdata;
struct pinctrl *pinctrl; struct pinctrl *pinctrl;
int ret = 0, irq_err, irq_dma; int ret = 0, irq_err, irq_dma;
@ -708,28 +706,20 @@ static int mxs_mmc_probe(struct platform_device *pdev)
if (!iores || !dmares || irq_err < 0 || irq_dma < 0) if (!iores || !dmares || irq_err < 0 || irq_dma < 0)
return -EINVAL; return -EINVAL;
r = request_mem_region(iores->start, resource_size(iores), pdev->name);
if (!r)
return -EBUSY;
mmc = mmc_alloc_host(sizeof(struct mxs_mmc_host), &pdev->dev); mmc = mmc_alloc_host(sizeof(struct mxs_mmc_host), &pdev->dev);
if (!mmc) { if (!mmc)
ret = -ENOMEM; return -ENOMEM;
goto out_release_mem;
}
host = mmc_priv(mmc); host = mmc_priv(mmc);
host->base = ioremap(r->start, resource_size(r)); host->base = devm_request_and_ioremap(&pdev->dev, iores);
if (!host->base) { if (!host->base) {
ret = -ENOMEM; ret = -EADDRNOTAVAIL;
goto out_mmc_free; goto out_mmc_free;
} }
host->devid = pdev->id_entry->driver_data; host->devid = pdev->id_entry->driver_data;
host->mmc = mmc; host->mmc = mmc;
host->res = r;
host->dma_res = dmares; host->dma_res = dmares;
host->irq = irq_err;
host->sdio_irq_en = 0; host->sdio_irq_en = 0;
pinctrl = devm_pinctrl_get_select_default(&pdev->dev); pinctrl = devm_pinctrl_get_select_default(&pdev->dev);
@ -741,7 +731,7 @@ static int mxs_mmc_probe(struct platform_device *pdev)
host->clk = clk_get(&pdev->dev, NULL); host->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(host->clk)) { if (IS_ERR(host->clk)) {
ret = PTR_ERR(host->clk); ret = PTR_ERR(host->clk);
goto out_iounmap; goto out_mmc_free;
} }
clk_prepare_enable(host->clk); clk_prepare_enable(host->clk);
@ -782,7 +772,8 @@ static int mxs_mmc_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, mmc); platform_set_drvdata(pdev, mmc);
ret = request_irq(host->irq, mxs_mmc_irq_handler, 0, DRIVER_NAME, host); ret = devm_request_irq(&pdev->dev, irq_err, mxs_mmc_irq_handler, 0,
DRIVER_NAME, host);
if (ret) if (ret)
goto out_free_dma; goto out_free_dma;
@ -790,26 +781,20 @@ static int mxs_mmc_probe(struct platform_device *pdev)
ret = mmc_add_host(mmc); ret = mmc_add_host(mmc);
if (ret) if (ret)
goto out_free_irq; goto out_free_dma;
dev_info(mmc_dev(host->mmc), "initialized\n"); dev_info(mmc_dev(host->mmc), "initialized\n");
return 0; return 0;
out_free_irq:
free_irq(host->irq, host);
out_free_dma: out_free_dma:
if (host->dmach) if (host->dmach)
dma_release_channel(host->dmach); dma_release_channel(host->dmach);
out_clk_put: out_clk_put:
clk_disable_unprepare(host->clk); clk_disable_unprepare(host->clk);
clk_put(host->clk); clk_put(host->clk);
out_iounmap:
iounmap(host->base);
out_mmc_free: out_mmc_free:
mmc_free_host(mmc); mmc_free_host(mmc);
out_release_mem:
release_mem_region(iores->start, resource_size(iores));
return ret; return ret;
} }
@ -817,12 +802,9 @@ static int mxs_mmc_remove(struct platform_device *pdev)
{ {
struct mmc_host *mmc = platform_get_drvdata(pdev); struct mmc_host *mmc = platform_get_drvdata(pdev);
struct mxs_mmc_host *host = mmc_priv(mmc); struct mxs_mmc_host *host = mmc_priv(mmc);
struct resource *res = host->res;
mmc_remove_host(mmc); mmc_remove_host(mmc);
free_irq(host->irq, host);
platform_set_drvdata(pdev, NULL); platform_set_drvdata(pdev, NULL);
if (host->dmach) if (host->dmach)
@ -831,12 +813,8 @@ static int mxs_mmc_remove(struct platform_device *pdev)
clk_disable_unprepare(host->clk); clk_disable_unprepare(host->clk);
clk_put(host->clk); clk_put(host->clk);
iounmap(host->base);
mmc_free_host(mmc); mmc_free_host(mmc);
release_mem_region(res->start, resource_size(res));
return 0; return 0;
} }