From: nyushchenko@dev.rtsoft.ru To: Grant Likely <grant.likely@linaro.org>, Rob Herring <robh+dt@kernel.org>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Thomas Gleixner <tglx@linutronix.de>, devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, lugovskoy@dev.rtsoft.ru, Nikita Yushchenko <nyushchenko@dev.rtsoft.ru> Subject: [PATCH 14/21] net/ethernet: use devm_irq_of_parse_and_map() where appropriate Date: Wed, 4 Jun 2014 15:13:14 +0400 [thread overview] Message-ID: <1401880402-30091-15-git-send-email-nyushchenko@dev.rtsoft.ru> (raw) In-Reply-To: <1401880402-30091-1-git-send-email-nyushchenko@dev.rtsoft.ru> From: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru> This avoids leak of IRQ mapping on error paths, and makes it possible to use devm_request_irq() without facing unmap-while-handler-installed issues. Signed-off-by: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru> --- drivers/net/ethernet/allwinner/sun4i-emac.c | 6 ++--- drivers/net/ethernet/arc/emac_main.c | 6 ++--- drivers/net/ethernet/marvell/mvneta.c | 15 +++++------- drivers/net/ethernet/moxa/moxart_ether.c | 4 ++-- .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 24 ++++++++------------ 5 files changed, 23 insertions(+), 32 deletions(-) diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index 2846067..9c2d0d7 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -839,10 +839,10 @@ static int emac_probe(struct platform_device *pdev) /* fill in parameters for net-dev structure */ ndev->base_addr = (unsigned long)db->membase; - ndev->irq = irq_of_parse_and_map(np, 0); - if (ndev->irq == -ENXIO) { + ndev->irq = devm_irq_of_parse_and_map(&pdev->dev, np, 0); + if (ndev->irq <= 0) { netdev_err(ndev, "No irq resource\n"); - ret = ndev->irq; + ret = ndev->irq ? ndev->irq : -EINVAL; goto out; } diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c index d647a7d..4de428d 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c @@ -650,10 +650,10 @@ static int arc_emac_probe(struct platform_device *pdev) } /* Get IRQ from device tree */ - irq = irq_of_parse_and_map(pdev->dev.of_node, 0); - if (!irq) { + irq = devm_irq_of_parse_and_map(&pdev->dev, pdev->dev.of_node, 0); + if (irq <= 0) { dev_err(&pdev->dev, "failed to retrieve <irq> value from device tree\n"); - return -ENODEV; + return irq ? irq : -ENODEV; } ndev = alloc_etherdev(sizeof(struct arc_emac_priv)); diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 14786c8..42043f2 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2789,9 +2789,9 @@ static int mvneta_probe(struct platform_device *pdev) if (!dev) return -ENOMEM; - dev->irq = irq_of_parse_and_map(dn, 0); - if (dev->irq == 0) { - err = -EINVAL; + dev->irq = devm_irq_of_parse_and_map(&pdev->dev, dn, 0); + if (dev->irq <= 0) { + err = dev->irq ? dev->irq : -EINVAL; goto err_free_netdev; } @@ -2799,14 +2799,14 @@ static int mvneta_probe(struct platform_device *pdev) if (!phy_node) { dev_err(&pdev->dev, "no associated PHY\n"); err = -ENODEV; - goto err_free_irq; + goto err_free_netdev; } phy_mode = of_get_phy_mode(dn); if (phy_mode < 0) { dev_err(&pdev->dev, "incorrect phy-mode\n"); err = -EINVAL; - goto err_free_irq; + goto err_free_netdev; } dev->tx_queue_len = MVNETA_MAX_TXD; @@ -2824,7 +2824,7 @@ static int mvneta_probe(struct platform_device *pdev) pp->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(pp->clk)) { err = PTR_ERR(pp->clk); - goto err_free_irq; + goto err_free_netdev; } clk_prepare_enable(pp->clk); @@ -2906,8 +2906,6 @@ err_free_stats: free_percpu(pp->stats); err_clk: clk_disable_unprepare(pp->clk); -err_free_irq: - irq_dispose_mapping(dev->irq); err_free_netdev: free_netdev(dev); return err; @@ -2923,7 +2921,6 @@ static int mvneta_remove(struct platform_device *pdev) mvneta_deinit(pp); clk_disable_unprepare(pp->clk); free_percpu(pp->stats); - irq_dispose_mapping(dev->irq); free_netdev(dev); return 0; diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index 5020fd4..b4de432 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -443,10 +443,10 @@ static int moxart_mac_probe(struct platform_device *pdev) if (!ndev) return -ENOMEM; - irq = irq_of_parse_and_map(node, 0); + irq = devm_irq_of_parse_and_map(p_dev, node, 0); if (irq <= 0) { netdev_err(ndev, "irq_of_parse_and_map failed\n"); - ret = -EINVAL; + ret = irq ? irq : -EINVAL; goto irq_map_fail; } diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c index b147d46..9118905 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c @@ -122,7 +122,7 @@ static int sxgbe_platform_probe(struct platform_device *pdev) } /* Get the SXGBE common INT information */ - priv->irq = irq_of_parse_and_map(node, 0); + priv->irq = devm_irq_of_parse_and_map(dev, node, 0); if (priv->irq <= 0) { dev_err(dev, "sxgbe common irq parsing failed\n"); goto err_drv_remove; @@ -130,25 +130,27 @@ static int sxgbe_platform_probe(struct platform_device *pdev) /* Get the TX/RX IRQ numbers */ for (i = 0, chan = 1; i < SXGBE_TX_QUEUES; i++) { - priv->txq[i]->irq_no = irq_of_parse_and_map(node, chan++); + priv->txq[i]->irq_no = devm_irq_of_parse_and_map(dev, + node, chan++); if (priv->txq[i]->irq_no <= 0) { dev_err(dev, "sxgbe tx irq parsing failed\n"); - goto err_tx_irq_unmap; + goto err_drv_remove; } } for (i = 0; i < SXGBE_RX_QUEUES; i++) { - priv->rxq[i]->irq_no = irq_of_parse_and_map(node, chan++); + priv->rxq[i]->irq_no = devm_irq_of_parse_and_map(dev, + node, chan++); if (priv->rxq[i]->irq_no <= 0) { dev_err(dev, "sxgbe rx irq parsing failed\n"); - goto err_rx_irq_unmap; + goto err_drv_remove; } } - priv->lpi_irq = irq_of_parse_and_map(node, chan); + priv->lpi_irq = devm_irq_of_parse_and_map(dev, node, chan); if (priv->lpi_irq <= 0) { dev_err(dev, "sxgbe lpi irq parsing failed\n"); - goto err_rx_irq_unmap; + goto err_drv_remove; } platform_set_drvdata(pdev, priv->dev); @@ -157,14 +159,6 @@ static int sxgbe_platform_probe(struct platform_device *pdev) return 0; -err_rx_irq_unmap: - while (--i) - irq_dispose_mapping(priv->rxq[i]->irq_no); - i = SXGBE_TX_QUEUES; -err_tx_irq_unmap: - while (--i) - irq_dispose_mapping(priv->txq[i]->irq_no); - irq_dispose_mapping(priv->irq); err_drv_remove: sxgbe_drv_remove(ndev); err_out: -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: nyushchenko-jFhMxQ4mL6a2X5qOxWx28w@public.gmane.org To: Grant Likely <grant.likely-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Benjamin Herrenschmidt <benh-XVmvHMARGAS8U2dJNN8I7kB+6BGkLq7r@public.gmane.org>, Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, lugovskoy-jFhMxQ4mL6a2X5qOxWx28w@public.gmane.org, Nikita Yushchenko <nyushchenko-jFhMxQ4mL6a2X5qOxWx28w@public.gmane.org> Subject: [PATCH 14/21] net/ethernet: use devm_irq_of_parse_and_map() where appropriate Date: Wed, 4 Jun 2014 15:13:14 +0400 [thread overview] Message-ID: <1401880402-30091-15-git-send-email-nyushchenko@dev.rtsoft.ru> (raw) In-Reply-To: <1401880402-30091-1-git-send-email-nyushchenko-jFhMxQ4mL6a2X5qOxWx28w@public.gmane.org> From: Nikita Yushchenko <nyushchenko-jFhMxQ4mL6a2X5qOxWx28w@public.gmane.org> This avoids leak of IRQ mapping on error paths, and makes it possible to use devm_request_irq() without facing unmap-while-handler-installed issues. Signed-off-by: Nikita Yushchenko <nyushchenko-jFhMxQ4mL6a2X5qOxWx28w@public.gmane.org> --- drivers/net/ethernet/allwinner/sun4i-emac.c | 6 ++--- drivers/net/ethernet/arc/emac_main.c | 6 ++--- drivers/net/ethernet/marvell/mvneta.c | 15 +++++------- drivers/net/ethernet/moxa/moxart_ether.c | 4 ++-- .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 24 ++++++++------------ 5 files changed, 23 insertions(+), 32 deletions(-) diff --git a/drivers/net/ethernet/allwinner/sun4i-emac.c b/drivers/net/ethernet/allwinner/sun4i-emac.c index 2846067..9c2d0d7 100644 --- a/drivers/net/ethernet/allwinner/sun4i-emac.c +++ b/drivers/net/ethernet/allwinner/sun4i-emac.c @@ -839,10 +839,10 @@ static int emac_probe(struct platform_device *pdev) /* fill in parameters for net-dev structure */ ndev->base_addr = (unsigned long)db->membase; - ndev->irq = irq_of_parse_and_map(np, 0); - if (ndev->irq == -ENXIO) { + ndev->irq = devm_irq_of_parse_and_map(&pdev->dev, np, 0); + if (ndev->irq <= 0) { netdev_err(ndev, "No irq resource\n"); - ret = ndev->irq; + ret = ndev->irq ? ndev->irq : -EINVAL; goto out; } diff --git a/drivers/net/ethernet/arc/emac_main.c b/drivers/net/ethernet/arc/emac_main.c index d647a7d..4de428d 100644 --- a/drivers/net/ethernet/arc/emac_main.c +++ b/drivers/net/ethernet/arc/emac_main.c @@ -650,10 +650,10 @@ static int arc_emac_probe(struct platform_device *pdev) } /* Get IRQ from device tree */ - irq = irq_of_parse_and_map(pdev->dev.of_node, 0); - if (!irq) { + irq = devm_irq_of_parse_and_map(&pdev->dev, pdev->dev.of_node, 0); + if (irq <= 0) { dev_err(&pdev->dev, "failed to retrieve <irq> value from device tree\n"); - return -ENODEV; + return irq ? irq : -ENODEV; } ndev = alloc_etherdev(sizeof(struct arc_emac_priv)); diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 14786c8..42043f2 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -2789,9 +2789,9 @@ static int mvneta_probe(struct platform_device *pdev) if (!dev) return -ENOMEM; - dev->irq = irq_of_parse_and_map(dn, 0); - if (dev->irq == 0) { - err = -EINVAL; + dev->irq = devm_irq_of_parse_and_map(&pdev->dev, dn, 0); + if (dev->irq <= 0) { + err = dev->irq ? dev->irq : -EINVAL; goto err_free_netdev; } @@ -2799,14 +2799,14 @@ static int mvneta_probe(struct platform_device *pdev) if (!phy_node) { dev_err(&pdev->dev, "no associated PHY\n"); err = -ENODEV; - goto err_free_irq; + goto err_free_netdev; } phy_mode = of_get_phy_mode(dn); if (phy_mode < 0) { dev_err(&pdev->dev, "incorrect phy-mode\n"); err = -EINVAL; - goto err_free_irq; + goto err_free_netdev; } dev->tx_queue_len = MVNETA_MAX_TXD; @@ -2824,7 +2824,7 @@ static int mvneta_probe(struct platform_device *pdev) pp->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(pp->clk)) { err = PTR_ERR(pp->clk); - goto err_free_irq; + goto err_free_netdev; } clk_prepare_enable(pp->clk); @@ -2906,8 +2906,6 @@ err_free_stats: free_percpu(pp->stats); err_clk: clk_disable_unprepare(pp->clk); -err_free_irq: - irq_dispose_mapping(dev->irq); err_free_netdev: free_netdev(dev); return err; @@ -2923,7 +2921,6 @@ static int mvneta_remove(struct platform_device *pdev) mvneta_deinit(pp); clk_disable_unprepare(pp->clk); free_percpu(pp->stats); - irq_dispose_mapping(dev->irq); free_netdev(dev); return 0; diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index 5020fd4..b4de432 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c @@ -443,10 +443,10 @@ static int moxart_mac_probe(struct platform_device *pdev) if (!ndev) return -ENOMEM; - irq = irq_of_parse_and_map(node, 0); + irq = devm_irq_of_parse_and_map(p_dev, node, 0); if (irq <= 0) { netdev_err(ndev, "irq_of_parse_and_map failed\n"); - ret = -EINVAL; + ret = irq ? irq : -EINVAL; goto irq_map_fail; } diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c index b147d46..9118905 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c @@ -122,7 +122,7 @@ static int sxgbe_platform_probe(struct platform_device *pdev) } /* Get the SXGBE common INT information */ - priv->irq = irq_of_parse_and_map(node, 0); + priv->irq = devm_irq_of_parse_and_map(dev, node, 0); if (priv->irq <= 0) { dev_err(dev, "sxgbe common irq parsing failed\n"); goto err_drv_remove; @@ -130,25 +130,27 @@ static int sxgbe_platform_probe(struct platform_device *pdev) /* Get the TX/RX IRQ numbers */ for (i = 0, chan = 1; i < SXGBE_TX_QUEUES; i++) { - priv->txq[i]->irq_no = irq_of_parse_and_map(node, chan++); + priv->txq[i]->irq_no = devm_irq_of_parse_and_map(dev, + node, chan++); if (priv->txq[i]->irq_no <= 0) { dev_err(dev, "sxgbe tx irq parsing failed\n"); - goto err_tx_irq_unmap; + goto err_drv_remove; } } for (i = 0; i < SXGBE_RX_QUEUES; i++) { - priv->rxq[i]->irq_no = irq_of_parse_and_map(node, chan++); + priv->rxq[i]->irq_no = devm_irq_of_parse_and_map(dev, + node, chan++); if (priv->rxq[i]->irq_no <= 0) { dev_err(dev, "sxgbe rx irq parsing failed\n"); - goto err_rx_irq_unmap; + goto err_drv_remove; } } - priv->lpi_irq = irq_of_parse_and_map(node, chan); + priv->lpi_irq = devm_irq_of_parse_and_map(dev, node, chan); if (priv->lpi_irq <= 0) { dev_err(dev, "sxgbe lpi irq parsing failed\n"); - goto err_rx_irq_unmap; + goto err_drv_remove; } platform_set_drvdata(pdev, priv->dev); @@ -157,14 +159,6 @@ static int sxgbe_platform_probe(struct platform_device *pdev) return 0; -err_rx_irq_unmap: - while (--i) - irq_dispose_mapping(priv->rxq[i]->irq_no); - i = SXGBE_TX_QUEUES; -err_tx_irq_unmap: - while (--i) - irq_dispose_mapping(priv->txq[i]->irq_no); - irq_dispose_mapping(priv->irq); err_drv_remove: sxgbe_drv_remove(ndev); err_out: -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-06-04 11:39 UTC|newest] Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-06-04 11:13 [PATCH 00/21] add and use devm_irq_of_parse_and_map() nyushchenko 2014-06-04 11:13 ` [PATCH 01/21] irq: add devres version of OF IRQ mapping routines nyushchenko 2014-06-04 13:39 ` Thomas Gleixner 2014-06-04 13:39 ` Thomas Gleixner 2014-06-04 11:13 ` [PATCH 02/21] ata: use devm_irq_of_parse_and_map() where appropriate nyushchenko 2014-06-04 11:13 ` [PATCH 03/21] exynos5440-cpufreq: use devm_irq_of_parse_and_map() nyushchenko 2014-06-04 11:13 ` [PATCH 04/21] omap-sham: " nyushchenko 2014-06-04 11:13 ` [PATCH 05/21] dma: use devm_irq_of_parse_and_map() where appropriate nyushchenko 2014-06-04 11:13 ` [PATCH 06/21] mpc85xx_edac: use devm_irq_of_parse_and_map() nyushchenko 2014-06-04 11:13 ` [PATCH 07/21] gpio: use devm_irq_of_parse_and_map() where appropriate nyushchenko 2014-06-04 11:13 ` [PATCH 08/21] i2c: " nyushchenko 2014-06-04 11:13 ` [PATCH 09/21] apbps2: use devm_irq_of_parse_and_map() nyushchenko 2014-06-04 11:13 ` [PATCH 10/21] media: use devm_irq_of_parse_and_map() where appropriate nyushchenko 2014-06-04 11:13 ` [PATCH 11/21] mfd: " nyushchenko 2014-06-04 11:13 ` nyushchenko-jFhMxQ4mL6a2X5qOxWx28w 2014-06-17 15:12 ` Lee Jones 2014-06-17 15:36 ` Nikita Yushchenko 2014-06-17 15:36 ` Nikita Yushchenko 2014-06-18 8:48 ` Lee Jones 2014-06-18 11:31 ` Nikita Yushchenko 2014-06-18 11:31 ` Nikita Yushchenko 2014-06-18 12:20 ` Lee Jones 2014-06-04 11:13 ` [PATCH 12/21] mpc5121_nfc: use devm_irq_of_parse_and_map() nyushchenko 2014-06-04 11:13 ` [PATCH 13/21] net/can: use devm_irq_of_parse_and_map() where appropriate nyushchenko 2014-06-04 11:13 ` nyushchenko [this message] 2014-06-04 11:13 ` [PATCH 14/21] net/ethernet: " nyushchenko-jFhMxQ4mL6a2X5qOxWx28w 2014-06-04 11:13 ` [PATCH 15/21] pinctrl: " nyushchenko 2014-06-04 11:13 ` nyushchenko-jFhMxQ4mL6a2X5qOxWx28w 2014-06-04 11:13 ` [PATCH 16/21] bq24190_charger: use devm_irq_of_parse_and_map() nyushchenko 2014-06-04 11:13 ` [PATCH 17/21] rtc-mpc5121: " nyushchenko 2014-06-04 11:13 ` [PATCH 18/21] spi: use devm_irq_of_parse_and_map() where appropriate nyushchenko 2014-06-04 11:13 ` [PATCH 19/21] exynos_tmu: use devm_irq_of_parse_and_map() nyushchenko 2014-06-04 11:13 ` [PATCH 20/21] usb: use devm_irq_of_parse_and_map() where appropriate nyushchenko 2014-06-04 11:13 ` nyushchenko-jFhMxQ4mL6a2X5qOxWx28w 2014-06-16 9:35 ` Andreas Larsson 2014-06-16 9:35 ` Andreas Larsson 2014-06-16 9:44 ` Nikita Yushchenko 2014-06-16 9:44 ` Nikita Yushchenko 2014-06-16 9:54 ` Andreas Larsson 2014-06-16 9:54 ` Andreas Larsson 2014-06-04 11:13 ` [PATCH 21/21] at91sam9_wdt: use devm_irq_of_parse_and_map() nyushchenko 2014-06-12 10:03 ` [PATCH 00/21] add and " Andreas Larsson 2014-06-12 10:03 ` Andreas Larsson [not found] ` <5399AE1B.1080301@gaisler.com> 2014-06-12 19:02 ` Nikita Yushchenko 2014-06-12 19:02 ` Nikita Yushchenko 2014-06-16 8:23 ` Andreas Larsson 2014-06-16 8:23 ` Andreas Larsson 2014-06-16 8:36 ` Nikita Yushchenko 2014-06-16 8:36 ` Nikita Yushchenko 2014-06-16 8:36 ` Nikita Yushchenko 2014-06-16 9:29 ` Andreas Larsson 2014-06-16 9:29 ` Andreas Larsson
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=1401880402-30091-15-git-send-email-nyushchenko@dev.rtsoft.ru \ --to=nyushchenko@dev.rtsoft.ru \ --cc=benh@kernel.crashing.org \ --cc=devicetree@vger.kernel.org \ --cc=grant.likely@linaro.org \ --cc=linux-kernel@vger.kernel.org \ --cc=lugovskoy@dev.rtsoft.ru \ --cc=robh+dt@kernel.org \ --cc=tglx@linutronix.de \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.