lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mmc: sh_mobile_sdhi: use managed resource allocations

Browse Source 
Use managed allocations to get memory, clock and interrupts . This
significantly simplifies clean up paths.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Guennadi Liakhovetski
2013-02-15 16:13:58 +01:00
committed by Chris Ball
parent 76a411f9f9
commit ac51b9611d
1 changed files with 14 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/mmc/host/sh_mobile_sdhi.c
View File

@@ -147,7 +147,7 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
int irq, ret, i = 0; int irq, ret, i = 0;
bool multiplexed_isr = true; bool multiplexed_isr = true;
priv = kzalloc(sizeof(struct sh_mobile_sdhi), GFP_KERNEL); priv = devm_kzalloc(&pdev->dev, sizeof(struct sh_mobile_sdhi), GFP_KERNEL);
if (priv == NULL) { if (priv == NULL) {
dev_err(&pdev->dev, "kzalloc failed\n"); dev_err(&pdev->dev, "kzalloc failed\n");
return -ENOMEM; return -ENOMEM;
@@ -159,11 +159,11 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
if (p->init) { if (p->init) {
ret = p->init(pdev, &sdhi_ops); ret = p->init(pdev, &sdhi_ops);
if (ret) if (ret)
goto einit; return ret;
} }
} }
priv->clk = clk_get(&pdev->dev, NULL); priv->clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(priv->clk)) { if (IS_ERR(priv->clk)) {
ret = PTR_ERR(priv->clk); ret = PTR_ERR(priv->clk);
dev_err(&pdev->dev, "cannot get clock: %d\n", ret); dev_err(&pdev->dev, "cannot get clock: %d\n", ret);
@@ -223,33 +223,33 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
irq = platform_get_irq_byname(pdev, SH_MOBILE_SDHI_IRQ_CARD_DETECT); irq = platform_get_irq_byname(pdev, SH_MOBILE_SDHI_IRQ_CARD_DETECT);
if (irq >= 0) { if (irq >= 0) {
multiplexed_isr = false; multiplexed_isr = false;
ret = request_irq(irq, tmio_mmc_card_detect_irq, 0, ret = devm_request_irq(&pdev->dev, irq, tmio_mmc_card_detect_irq, 0,
dev_name(&pdev->dev), host); dev_name(&pdev->dev), host);
if (ret) if (ret)
goto eirq_card_detect; goto eirq;
} }
irq = platform_get_irq_byname(pdev, SH_MOBILE_SDHI_IRQ_SDIO); irq = platform_get_irq_byname(pdev, SH_MOBILE_SDHI_IRQ_SDIO);
if (irq >= 0) { if (irq >= 0) {
multiplexed_isr = false; multiplexed_isr = false;
ret = request_irq(irq, tmio_mmc_sdio_irq, 0, ret = devm_request_irq(&pdev->dev, irq, tmio_mmc_sdio_irq, 0,
dev_name(&pdev->dev), host); dev_name(&pdev->dev), host);
if (ret) if (ret)
goto eirq_sdio; goto eirq;
} }
irq = platform_get_irq_byname(pdev, SH_MOBILE_SDHI_IRQ_SDCARD); irq = platform_get_irq_byname(pdev, SH_MOBILE_SDHI_IRQ_SDCARD);
if (irq >= 0) { if (irq >= 0) {
multiplexed_isr = false; multiplexed_isr = false;
ret = request_irq(irq, tmio_mmc_sdcard_irq, 0, ret = devm_request_irq(&pdev->dev, irq, tmio_mmc_sdcard_irq, 0,
dev_name(&pdev->dev), host); dev_name(&pdev->dev), host);
if (ret) if (ret)
goto eirq_sdcard; goto eirq;
} else if (!multiplexed_isr) { } else if (!multiplexed_isr) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Principal SD-card IRQ is missing among named interrupts\n"); "Principal SD-card IRQ is missing among named interrupts\n");
ret = irq; ret = irq;
goto eirq_sdcard; goto eirq;
} }
if (multiplexed_isr) { if (multiplexed_isr) {
@@ -258,15 +258,15 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
if (irq < 0) if (irq < 0)
break; break;
i++; i++;
ret = request_irq(irq, tmio_mmc_irq, 0, ret = devm_request_irq(&pdev->dev, irq, tmio_mmc_irq, 0,
dev_name(&pdev->dev), host); dev_name(&pdev->dev), host);
if (ret) if (ret)
goto eirq_multiplexed; goto eirq;
} }
/* There must be at least one IRQ source */ /* There must be at least one IRQ source */
if (!i) if (!i)
goto eirq_multiplexed; goto eirq;
} }
dev_info(&pdev->dev, "%s base at 0x%08lx clock rate %u MHz\n", dev_info(&pdev->dev, "%s base at 0x%08lx clock rate %u MHz\n",
@@ -276,28 +276,12 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
return ret; return ret;
eirq_multiplexed: eirq:
while (i--) {
irq = platform_get_irq(pdev, i);
free_irq(irq, host);
}
eirq_sdcard:
irq = platform_get_irq_byname(pdev, SH_MOBILE_SDHI_IRQ_SDIO);
if (irq >= 0)
free_irq(irq, host);
eirq_sdio:
irq = platform_get_irq_byname(pdev, SH_MOBILE_SDHI_IRQ_CARD_DETECT);
if (irq >= 0)
free_irq(irq, host);
eirq_card_detect:
tmio_mmc_host_remove(host); tmio_mmc_host_remove(host);
eprobe: eprobe:
clk_put(priv->clk);
eclkget: eclkget:
if (p && p->cleanup) if (p && p->cleanup)
p->cleanup(pdev); p->cleanup(pdev);
einit:
kfree(priv);
return ret; return ret;
} }
@@ -305,26 +289,13 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev)
{ {
struct mmc_host *mmc = platform_get_drvdata(pdev); struct mmc_host *mmc = platform_get_drvdata(pdev);
struct tmio_mmc_host *host = mmc_priv(mmc); struct tmio_mmc_host *host = mmc_priv(mmc);
struct sh_mobile_sdhi *priv = container_of(host->pdata, struct sh_mobile_sdhi, mmc_data);
struct sh_mobile_sdhi_info *p = pdev->dev.platform_data; struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
int i = 0, irq;
tmio_mmc_host_remove(host); tmio_mmc_host_remove(host);
while (1) {
irq = platform_get_irq(pdev, i++);
if (irq < 0)
break;
free_irq(irq, host);
}
clk_put(priv->clk);
if (p && p->cleanup) if (p && p->cleanup)
p->cleanup(pdev); p->cleanup(pdev);
kfree(priv);
return 0; return 0;
} }