Message ID | 1395916769-20475-1-git-send-email-thomas.petazzoni@free-electrons.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Date: Thu, 27 Mar 2014 11:39:29 +0100 > The mvneta driver currently uses of_iomap(), which has two drawbacks: > it doesn't request the resource, and it isn't devm-style so some error > handling is needed. > > This commit switches to use devm_ioremap_resource() instead, which > automatically requests the resource (so the I/O registers region shows > up properly in /proc/iomem), and also is devm-style, which allows to > get rid of some error handling to unmap the I/O registers region. > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Does this actually fix any bugs? It seems like the unmaps happen in all the necessary cases. If it's just a simplification or cleanup I'm going to apply this to net-next. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Dear David Miller, On Fri, 28 Mar 2014 16:10:07 -0400 (EDT), David Miller wrote: > From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Date: Thu, 27 Mar 2014 11:39:29 +0100 > > > The mvneta driver currently uses of_iomap(), which has two drawbacks: > > it doesn't request the resource, and it isn't devm-style so some error > > handling is needed. > > > > This commit switches to use devm_ioremap_resource() instead, which > > automatically requests the resource (so the I/O registers region shows > > up properly in /proc/iomem), and also is devm-style, which allows to > > get rid of some error handling to unmap the I/O registers region. > > > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > > Does this actually fix any bugs? It seems like the unmaps happen in > all the necessary cases. > > If it's just a simplification or cleanup I'm going to apply this to > net-next. The patch does not fix any bug, it is simply a cleanup/improvement, and therefore applying to net-next is perfectly fine for me. Actually, it's the very reason why I sent it separately from the two other patches that fix the usage of mvneta as a module, which, them, were really bug fixes. Thanks a lot! Thomas
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index f418f4f..e251ec7 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c @@ -22,6 +22,7 @@ #include <linux/interrupt.h> #include <net/ip.h> #include <net/ipv6.h> +#include <linux/io.h> #include <linux/of.h> #include <linux/of_irq.h> #include <linux/of_mdio.h> @@ -2774,6 +2775,7 @@ static void mvneta_port_power_up(struct mvneta_port *pp, int phy_mode) static int mvneta_probe(struct platform_device *pdev) { const struct mbus_dram_target_info *dram_target_info; + struct resource *res; struct device_node *dn = pdev->dev.of_node; struct device_node *phy_node; u32 phy_addr; @@ -2838,9 +2840,10 @@ static int mvneta_probe(struct platform_device *pdev) clk_prepare_enable(pp->clk); - pp->base = of_iomap(dn, 0); - if (pp->base == NULL) { - err = -ENOMEM; + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + pp->base = devm_ioremap_resource(&pdev->dev, res); + if (IS_ERR(pp->base)) { + err = PTR_ERR(pp->base); goto err_clk; } @@ -2848,7 +2851,7 @@ static int mvneta_probe(struct platform_device *pdev) pp->stats = alloc_percpu(struct mvneta_pcpu_stats); if (!pp->stats) { err = -ENOMEM; - goto err_unmap; + goto err_clk; } for_each_possible_cpu(cpu) { @@ -2913,8 +2916,6 @@ err_deinit: mvneta_deinit(pp); err_free_stats: free_percpu(pp->stats); -err_unmap: - iounmap(pp->base); err_clk: clk_disable_unprepare(pp->clk); err_free_irq: @@ -2934,7 +2935,6 @@ static int mvneta_remove(struct platform_device *pdev) mvneta_deinit(pp); clk_disable_unprepare(pp->clk); free_percpu(pp->stats); - iounmap(pp->base); irq_dispose_mapping(dev->irq); free_netdev(dev);