From: Julia Lawall <Julia.Lawall@xxxxxxx> 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@xxxxxxx> --- 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; } -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html