evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: sh_mmcif: simplify and use meaningful label names in error-handling

Browse source 
A check for NULL platform data can be conveniently made in the very
beginning of probing. Replace numbered error-handling labels in .probe()
with meaningful names to make any future reorganisation simpler.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Reviewed-by: Simon Horman <horms@verge.net.au>
Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Guennadi Liakhovetski 2012-04-19 16:15:52 +02:00 • committed by Chris Ball
parent 944640d0ff
commit e1aae2eb3f
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
drivers/mmc/host/sh_mmcif.c
View file

@ -1241,11 +1241,16 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
int ret = 0, irq[2]; int ret = 0, irq[2];
struct mmc_host *mmc; struct mmc_host *mmc;
struct sh_mmcif_host *host; struct sh_mmcif_host *host;
struct sh_mmcif_plat_data *pd; struct sh_mmcif_plat_data *pd = pdev->dev.platform_data;
struct resource *res; struct resource *res;
void __iomem *reg; void __iomem *reg;
char clk_name[8]; char clk_name[8];
if (!pd) {
dev_err(&pdev->dev, "sh_mmcif plat data error.\n");
return -ENXIO;
}
irq[0] = platform_get_irq(pdev, 0); irq[0] = platform_get_irq(pdev, 0);
irq[1] = platform_get_irq(pdev, 1); irq[1] = platform_get_irq(pdev, 1);
if (irq[0] < 0 || irq[1] < 0) { if (irq[0] < 0 || irq[1] < 0) {
@ -1262,16 +1267,11 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "ioremap error.\n"); dev_err(&pdev->dev, "ioremap error.\n");
return -ENOMEM; return -ENOMEM;
} }
pd = pdev->dev.platform_data;
if (!pd) {
dev_err(&pdev->dev, "sh_mmcif plat data error.\n");
ret = -ENXIO;
goto clean_up;
}
mmc = mmc_alloc_host(sizeof(struct sh_mmcif_host), &pdev->dev); mmc = mmc_alloc_host(sizeof(struct sh_mmcif_host), &pdev->dev);
if (!mmc) { if (!mmc) {
ret = -ENOMEM; ret = -ENOMEM;
goto clean_up; goto ealloch;
} }
host = mmc_priv(mmc); host = mmc_priv(mmc);
host->mmc = mmc; host->mmc = mmc;
@ -1283,7 +1283,7 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
if (IS_ERR(host->hclk)) { if (IS_ERR(host->hclk)) {
dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name); dev_err(&pdev->dev, "cannot get clock \"%s\"\n", clk_name);
ret = PTR_ERR(host->hclk); ret = PTR_ERR(host->hclk);
goto clean_up1; goto eclkget;
} }
clk_enable(host->hclk); clk_enable(host->hclk);
host->clk = clk_get_rate(host->hclk); host->clk = clk_get_rate(host->hclk);
@ -1313,7 +1313,7 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
ret = pm_runtime_resume(&pdev->dev); ret = pm_runtime_resume(&pdev->dev);
if (ret < 0) if (ret < 0)
goto clean_up2; goto eresume;
INIT_DELAYED_WORK(&host->timeout_work, mmcif_timeout_work); INIT_DELAYED_WORK(&host->timeout_work, mmcif_timeout_work);
@ -1322,17 +1322,17 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
ret = request_threaded_irq(irq[0], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:error", host); ret = request_threaded_irq(irq[0], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:error", host);
if (ret) { if (ret) {
dev_err(&pdev->dev, "request_irq error (sh_mmc:error)\n"); dev_err(&pdev->dev, "request_irq error (sh_mmc:error)\n");
goto clean_up3; goto ereqirq0;
} }
ret = request_threaded_irq(irq[1], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:int", host); ret = request_threaded_irq(irq[1], sh_mmcif_intr, sh_mmcif_irqt, 0, "sh_mmc:int", host);
if (ret) { if (ret) {
dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n"); dev_err(&pdev->dev, "request_irq error (sh_mmc:int)\n");
goto clean_up4; goto ereqirq1;
} }
ret = mmc_add_host(mmc); ret = mmc_add_host(mmc);
if (ret < 0) if (ret < 0)
goto clean_up5; goto emmcaddh;
dev_pm_qos_expose_latency_limit(&pdev->dev, 100); dev_pm_qos_expose_latency_limit(&pdev->dev, 100);
@ -1341,19 +1341,18 @@ static int __devinit sh_mmcif_probe(struct platform_device *pdev)
sh_mmcif_readl(host->addr, MMCIF_CE_VERSION) & 0x0000ffff); sh_mmcif_readl(host->addr, MMCIF_CE_VERSION) & 0x0000ffff);
return ret; return ret;
clean_up5: emmcaddh:
free_irq(irq[1], host); free_irq(irq[1], host);
clean_up4: ereqirq1:
free_irq(irq[0], host); free_irq(irq[0], host);
clean_up3: ereqirq0:
pm_runtime_suspend(&pdev->dev); pm_runtime_suspend(&pdev->dev);
clean_up2: eresume:
pm_runtime_disable(&pdev->dev); pm_runtime_disable(&pdev->dev);
clk_disable(host->hclk); clk_disable(host->hclk);
clean_up1: eclkget:
mmc_free_host(mmc); mmc_free_host(mmc);
clean_up: ealloch:
if (reg)
iounmap(reg); iounmap(reg);
return ret; return ret;
} }