Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5f3b75d authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by David S. Miller
Browse files

net: mvneta: use devm_ioremap_resource() instead of of_iomap() 



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: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e3a8786c

drivers/net/ethernet/marvell/mvneta.c

+11 −6
Original line number Diff line number Diff line
@@ -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>
@@ -2749,6 +2750,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;
@@ -2813,9 +2815,15 @@ static int mvneta_probe(struct platform_device *pdev) 


	clk_prepare_enable(pp->clk);



	pp->base = of_iomap(dn, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		err = -ENODEV;

		goto err_clk;

	}



	pp->base = devm_ioremap_resource(&pdev->dev, res);

	if (pp->base == NULL) {

		err = -ENOMEM;

		err = PTR_ERR(pp->base);

		goto err_clk;

	}
@@ -2823,7 +2831,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) {
@@ -2888,8 +2896,6 @@ static int mvneta_probe(struct platform_device *pdev) 
	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:
@@ -2909,7 +2915,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);