Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 50f5a341 authored by Sascha Hauer's avatar Sascha Hauer Committed by Jeff Garzik
Browse files

pata_imx: Use devm_clk_get 



To make the error path a bit simpler.

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 2de1d5e1

drivers/ata/pata_imx.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ static int pata_imx_probe(struct platform_device *pdev) 
	if (!priv)

	if (!priv)

		return -ENOMEM;

		return -ENOMEM;





	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)) {

		dev_err(&pdev->dev, "Failed to get clock\n");

		dev_err(&pdev->dev, "Failed to get clock\n");

		return PTR_ERR(priv->clk);

		return PTR_ERR(priv->clk);
@@ -163,7 +163,7 @@ static int pata_imx_probe(struct platform_device *pdev) 




free_priv:

free_priv:

	clk_disable_unprepare(priv->clk);

	clk_disable_unprepare(priv->clk);

	clk_put(priv->clk);



	return -ENOMEM;

	return -ENOMEM;

}

}
@@ -177,7 +177,6 @@ static int pata_imx_remove(struct platform_device *pdev) 
	__raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN);

	__raw_writel(0, priv->host_regs + PATA_IMX_ATA_INT_EN);





	clk_disable_unprepare(priv->clk);

	clk_disable_unprepare(priv->clk);

	clk_put(priv->clk);





	return 0;

	return 0;

}

}