From patchwork Sun Jul 21 16:25:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 260533 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 36A1E2C00C1 for ; Mon, 22 Jul 2013 02:25:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755895Ab3GUQZp (ORCPT ); Sun, 21 Jul 2013 12:25:45 -0400 Received: from mail-ye0-f178.google.com ([209.85.213.178]:51629 "EHLO mail-ye0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755808Ab3GUQZo (ORCPT ); Sun, 21 Jul 2013 12:25:44 -0400 Received: by mail-ye0-f178.google.com with SMTP id m15so1873298yen.9 for ; Sun, 21 Jul 2013 09:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=qKWka4CN8vRDRFapdRnuSb4g2OjrDRkEGk5qUYKxyG0=; b=RhyLSBLhTzd5AD7S4El8rYVEXyDYSBqjNG+4Eq48ogMDWXr1ws/bBMbVIhjBteep0p QDdvlmEl18YKEZCWA5An78sDxWee/1pdEG/8qV/4HTlSEwdlrtYtinsvBZvhXZvz8xHg kwD8tO8zkvAns0gx0ZfcDRJ1x9+J2aLdH1IyXQWb6Gbf9aldJL4nHV+WryEfhG2YryRx DHgd4goZVIw2sZYP67aQvQDH24yYX0sdH4bevtPsKFA0TTmt79S7VJbWqceJg+HVBclI iySrf7UPFjbzejlkv0TtZF6zmapOURIwUlhk+cW9sZxTCWJHLvJNzGKBhL+bFY1zMqru In/g== X-Received: by 10.236.27.234 with SMTP id e70mr12089864yha.15.1374423943809; Sun, 21 Jul 2013 09:25:43 -0700 (PDT) Received: from localhost.localdomain ([189.5.19.145]) by mx.google.com with ESMTPSA id i27sm34053395yhj.24.2013.07.21.09.25.42 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 21 Jul 2013 09:25:43 -0700 (PDT) From: Fabio Estevam To: davem@davemloft.net Cc: kernel@pengutronix.de, Frank.Li@freescale.com, shawn.guo@linaro.org, netdev@vger.kernel.org, Fabio Estevam Subject: [PATCH 6/6] fec: Use devm_request_irq() Date: Sun, 21 Jul 2013 13:25:04 -0300 Message-Id: <1374423904-2668-7-git-send-email-festevam@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1374423904-2668-1-git-send-email-festevam@gmail.com> References: <1374423904-2668-1-git-send-email-festevam@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Fabio Estevam Using devm_request_irq() can make the code smaller and cleaner. Signed-off-by: Fabio Estevam --- drivers/net/ethernet/freescale/fec_main.c | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 03028c4..0642006 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -2149,14 +2149,10 @@ fec_probe(struct platform_device *pdev) ret = irq; goto failed_irq; } - ret = request_irq(irq, fec_enet_interrupt, IRQF_DISABLED, pdev->name, ndev); - if (ret) { - while (--i >= 0) { - irq = platform_get_irq(pdev, i); - free_irq(irq, ndev); - } + ret = devm_request_irq(&pdev->dev, irq, fec_enet_interrupt, + IRQF_DISABLED, pdev->name, ndev); + if (ret) goto failed_irq; - } } ret = fec_enet_mii_init(pdev); @@ -2180,11 +2176,6 @@ failed_register: fec_enet_mii_remove(fep); failed_mii_init: failed_irq: - for (i = 0; i < FEC_IRQ_NUM; i++) { - irq = platform_get_irq(pdev, i); - if (irq > 0) - free_irq(irq, ndev); - } failed_init: if (fep->reg_phy) regulator_disable(fep->reg_phy); @@ -2210,17 +2201,11 @@ fec_drv_remove(struct platform_device *pdev) { struct net_device *ndev = platform_get_drvdata(pdev); struct fec_enet_private *fep = netdev_priv(ndev); - int i; cancel_delayed_work_sync(&(fep->delay_work.delay_work)); unregister_netdev(ndev); fec_enet_mii_remove(fep); del_timer_sync(&fep->time_keep); - for (i = 0; i < FEC_IRQ_NUM; i++) { - int irq = platform_get_irq(pdev, i); - if (irq > 0) - free_irq(irq, ndev); - } if (fep->reg_phy) regulator_disable(fep->reg_phy); if (fep->clk_ptp)