From: Fabio Estevam <festevam@gmail.com>
To: davem@davemloft.net
Cc: kernel@pengutronix.de, Frank.Li@freescale.com,
shawn.guo@linaro.org, netdev@vger.kernel.org,
Fabio Estevam <fabio.estevam@freescale.com>
Subject: [PATCH 6/6] fec: Use devm_request_irq()
Date: Sun, 21 Jul 2013 13:25:04 -0300 [thread overview]
Message-ID: <1374423904-2668-7-git-send-email-festevam@gmail.com> (raw)
In-Reply-To: <1374423904-2668-1-git-send-email-festevam@gmail.com>
From: Fabio Estevam <fabio.estevam@freescale.com>
Using devm_request_irq() can make the code smaller and cleaner.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
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)
--
1.8.1.2
next prev parent reply other threads:[~2013-07-21 16:25 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-21 16:24 [PATCH 0/6] fec: Improve resources handling Fabio Estevam
2013-07-21 16:24 ` [PATCH 1/6] fec: Do not enable/disable optional clocks unconditionally Fabio Estevam
2013-07-21 16:25 ` [PATCH 2/6] fec: Fix the order for enabling/disabling the clocks Fabio Estevam
2013-07-21 16:25 ` [PATCH 3/6] fec: Enable/disable clk_ptp in suspend/resume Fabio Estevam
2013-07-21 16:25 ` [PATCH 4/6] fec: Check the return value from clk_prepare_enable() Fabio Estevam
2013-07-21 16:25 ` [PATCH 5/6] fec: Remove unneeded check in platform_get_resource() Fabio Estevam
2013-07-21 16:25 ` Fabio Estevam [this message]
2013-07-22 4:21 ` [PATCH 0/6] fec: Improve resources handling Frank Li
2013-07-22 23:51 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1374423904-2668-7-git-send-email-festevam@gmail.com \
--to=festevam@gmail.com \
--cc=Frank.Li@freescale.com \
--cc=davem@davemloft.net \
--cc=fabio.estevam@freescale.com \
--cc=kernel@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=shawn.guo@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).