Commit b1ab474f authored by Fabio Estevam's avatar Fabio Estevam Committed by Brian Norris

mtd: fsl-quadspi: Remove unnecessary 'map_failed' label

There is no need to keep the 'map_failed' label. We can simply return the error
code directly and let the code shorter and cleaner.
Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Acked-by: default avatarHan Xu <han.xu@freescale.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 50131b73
...@@ -798,37 +798,30 @@ static int fsl_qspi_probe(struct platform_device *pdev) ...@@ -798,37 +798,30 @@ static int fsl_qspi_probe(struct platform_device *pdev)
/* find the resources */ /* find the resources */
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "QuadSPI"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "QuadSPI");
q->iobase = devm_ioremap_resource(dev, res); q->iobase = devm_ioremap_resource(dev, res);
if (IS_ERR(q->iobase)) { if (IS_ERR(q->iobase))
ret = PTR_ERR(q->iobase); return PTR_ERR(q->iobase);
goto map_failed;
}
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, res = platform_get_resource_byname(pdev, IORESOURCE_MEM,
"QuadSPI-memory"); "QuadSPI-memory");
q->ahb_base = devm_ioremap_resource(dev, res); q->ahb_base = devm_ioremap_resource(dev, res);
if (IS_ERR(q->ahb_base)) { if (IS_ERR(q->ahb_base))
ret = PTR_ERR(q->ahb_base); return PTR_ERR(q->ahb_base);
goto map_failed;
}
q->memmap_phy = res->start; q->memmap_phy = res->start;
/* find the clocks */ /* find the clocks */
q->clk_en = devm_clk_get(dev, "qspi_en"); q->clk_en = devm_clk_get(dev, "qspi_en");
if (IS_ERR(q->clk_en)) { if (IS_ERR(q->clk_en))
ret = PTR_ERR(q->clk_en); return PTR_ERR(q->clk_en);
goto map_failed;
}
q->clk = devm_clk_get(dev, "qspi"); q->clk = devm_clk_get(dev, "qspi");
if (IS_ERR(q->clk)) { if (IS_ERR(q->clk))
ret = PTR_ERR(q->clk); return PTR_ERR(q->clk);
goto map_failed;
}
ret = clk_prepare_enable(q->clk_en); ret = clk_prepare_enable(q->clk_en);
if (ret) { if (ret) {
dev_err(dev, "can not enable the qspi_en clock\n"); dev_err(dev, "can not enable the qspi_en clock\n");
goto map_failed; return ret;
} }
ret = clk_prepare_enable(q->clk); ret = clk_prepare_enable(q->clk);
...@@ -952,7 +945,6 @@ static int fsl_qspi_probe(struct platform_device *pdev) ...@@ -952,7 +945,6 @@ static int fsl_qspi_probe(struct platform_device *pdev)
clk_disable_unprepare(q->clk); clk_disable_unprepare(q->clk);
clk_failed: clk_failed:
clk_disable_unprepare(q->clk_en); clk_disable_unprepare(q->clk_en);
map_failed:
return ret; return ret;
} }
......
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