* [PATCH] drivers/ata/pata_mpc52xx.c: drop unneeded devm cleanup functions
@ 2012-03-10 21:35 Julia Lawall
2012-03-18 20:58 ` Grant Likely
0 siblings, 1 reply; 2+ messages in thread
From: Julia Lawall @ 2012-03-10 21:35 UTC (permalink / raw)
To: Jeff Garzik
Cc: kernel-janitors, Grant Likely, Rob Herring, linux-ide,
linux-kernel, devicetree-discuss, w.sang
From: Julia Lawall <Julia.Lawall@lip6.fr>
There is no need to call the devm cleanup functions on failure of a probe
or remove function.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
---
Changed subject. Included Wolfram's ACK.
drivers/ata/pata_mpc52xx.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 00748ae..1f02008 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -806,17 +806,12 @@ mpc52xx_ata_probe(struct platform_device *op)
return 0;
err:
- devm_release_mem_region(&op->dev, res_mem.start, sizeof(*ata_regs));
if (ata_irq)
irq_dispose_mapping(ata_irq);
if (task_irq)
irq_dispose_mapping(task_irq);
if (dmatsk)
bcom_ata_release(dmatsk);
- if (ata_regs)
- devm_iounmap(&op->dev, ata_regs);
- if (priv)
- devm_kfree(&op->dev, priv);
return rv;
}
@@ -835,12 +830,6 @@ mpc52xx_ata_remove(struct platform_device *op)
bcom_ata_release(priv->dmatsk);
irq_dispose_mapping(priv->ata_irq);
- /* Clear up IO allocations */
- devm_iounmap(&op->dev, priv->ata_regs);
- devm_release_mem_region(&op->dev, priv->ata_regs_pa,
- sizeof(*priv->ata_regs));
- devm_kfree(&op->dev, priv);
-
return 0;
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drivers/ata/pata_mpc52xx.c: drop unneeded devm cleanup functions
2012-03-10 21:35 [PATCH] drivers/ata/pata_mpc52xx.c: drop unneeded devm cleanup functions Julia Lawall
@ 2012-03-18 20:58 ` Grant Likely
0 siblings, 0 replies; 2+ messages in thread
From: Grant Likely @ 2012-03-18 20:58 UTC (permalink / raw)
To: Julia Lawall, Jeff Garzik
Cc: kernel-janitors, Rob Herring, linux-ide, linux-kernel,
devicetree-discuss, w.sang
On Sat, 10 Mar 2012 22:35:52 +0100, Julia Lawall <Julia.Lawall@lip6.fr> wrote:
> From: Julia Lawall <Julia.Lawall@lip6.fr>
>
> There is no need to call the devm cleanup functions on failure of a probe
> or remove function.
>
> Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
> Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
>
> ---
> Changed subject. Included Wolfram's ACK.
>
> drivers/ata/pata_mpc52xx.c | 11 -----------
> 1 file changed, 11 deletions(-)
>
> diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
> index 00748ae..1f02008 100644
> --- a/drivers/ata/pata_mpc52xx.c
> +++ b/drivers/ata/pata_mpc52xx.c
> @@ -806,17 +806,12 @@ mpc52xx_ata_probe(struct platform_device *op)
> return 0;
>
> err:
> - devm_release_mem_region(&op->dev, res_mem.start, sizeof(*ata_regs));
> if (ata_irq)
> irq_dispose_mapping(ata_irq);
> if (task_irq)
> irq_dispose_mapping(task_irq);
> if (dmatsk)
> bcom_ata_release(dmatsk);
> - if (ata_regs)
> - devm_iounmap(&op->dev, ata_regs);
> - if (priv)
> - devm_kfree(&op->dev, priv);
> return rv;
> }
>
> @@ -835,12 +830,6 @@ mpc52xx_ata_remove(struct platform_device *op)
> bcom_ata_release(priv->dmatsk);
> irq_dispose_mapping(priv->ata_irq);
>
> - /* Clear up IO allocations */
> - devm_iounmap(&op->dev, priv->ata_regs);
> - devm_release_mem_region(&op->dev, priv->ata_regs_pa,
> - sizeof(*priv->ata_regs));
> - devm_kfree(&op->dev, priv);
> -
> return 0;
> }
>
>
--
Grant Likely, B.Sc, P.Eng.
Secret Lab Technologies,Ltd.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-18 20:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-10 21:35 [PATCH] drivers/ata/pata_mpc52xx.c: drop unneeded devm cleanup functions Julia Lawall
2012-03-18 20:58 ` Grant Likely
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).