Skip to content

Commit

Permalink
drivers: bus: imx-weim: Simplify error path
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Shiyan <[email protected]>
Signed-off-by: Shawn Guo <[email protected]>
  • Loading branch information
shcgit authored and shawnguo2 committed Aug 16, 2013
1 parent 70ac98d commit b2d1fb7
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions drivers/bus/imx-weim.c
Original file line number Diff line number Diff line change
Expand Up @@ -78,36 +78,30 @@ static int weim_probe(struct platform_device *pdev)
struct resource *res;
struct clk *clk;
void __iomem *base;
int ret = -EINVAL;
int ret;

/* get the resource */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
base = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(base)) {
ret = PTR_ERR(base);
goto weim_err;
}
if (IS_ERR(base))
return PTR_ERR(base);

/* get the clock */
clk = devm_clk_get(&pdev->dev, NULL);
if (IS_ERR(clk))
goto weim_err;
return PTR_ERR(clk);

ret = clk_prepare_enable(clk);
if (ret)
goto weim_err;
return ret;

/* parse the device node */
ret = weim_parse_dt(pdev, base);
if (ret) {
if (ret)
clk_disable_unprepare(clk);
goto weim_err;
}

dev_info(&pdev->dev, "WEIM driver registered.\n");
return 0;
else
dev_info(&pdev->dev, "Driver registered.\n");

weim_err:
return ret;
}

Expand Down

0 comments on commit b2d1fb7

Please sign in to comment.