From patchwork Sat Mar 10 21:35:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 145900 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 229C6B6FC9 for ; Sun, 11 Mar 2012 08:36:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752379Ab2CJVgA (ORCPT ); Sat, 10 Mar 2012 16:36:00 -0500 Received: from mgw2.diku.dk ([130.225.96.92]:38291 "EHLO mgw2.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752014Ab2CJVgA (ORCPT ); Sat, 10 Mar 2012 16:36:00 -0500 Received: from localhost (localhost [127.0.0.1]) by mgw2.diku.dk (Postfix) with ESMTP id BC62C19BDFB; Sat, 10 Mar 2012 22:35:57 +0100 (CET) Received: from mgw2.diku.dk ([127.0.0.1]) by localhost (mgw2.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 22364-13; Sat, 10 Mar 2012 22:35:52 +0100 (CET) Received: from palace.topps.diku.dk (palace.ekstranet.diku.dk [192.38.115.202]) by mgw2.diku.dk (Postfix) with ESMTP id 3CFFB19BDFA; Sat, 10 Mar 2012 22:35:52 +0100 (CET) From: Julia Lawall To: Jeff Garzik Cc: kernel-janitors@vger.kernel.org, Grant Likely , Rob Herring , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, w.sang@pengutronix.de Subject: [PATCH] drivers/ata/pata_mpc52xx.c: drop unneeded devm cleanup functions Date: Sat, 10 Mar 2012 22:35:52 +0100 Message-Id: <1331415352-10260-1-git-send-email-Julia.Lawall@lip6.fr> X-Mailer: git-send-email 1.7.3.4 Sender: linux-ide-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ide@vger.kernel.org From: Julia Lawall There is no need to call the devm cleanup functions on failure of a probe or remove function. Signed-off-by: Julia Lawall Acked-by: Wolfram Sang Acked-by: Grant Likely --- Changed subject. Included Wolfram's ACK. drivers/ata/pata_mpc52xx.c | 11 ----------- 1 file changed, 11 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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; }