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

Commit 345af953 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'for-davem' of git://gitorious.org/linux-can/linux-can-next 



Marc Kleine-Budde says:

====================
this is a pull-request for net-next/master. It consists of 4 patches by
Jingoo Han, which remove the unnecessary platform_set_drvdata() and a
patch by Laurent Navet converting the grcan driver to use
devm_ioremap_resource().
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ed8a83a1 5727dc6b

drivers/net/can/at91_can.c

+0 −2
Original line number Diff line number Diff line
@@ -1393,8 +1393,6 @@ static int at91_can_remove(struct platform_device *pdev) 


	unregister_netdev(dev);



	platform_set_drvdata(pdev, NULL);



	iounmap(priv->reg_base);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

drivers/net/can/c_can/c_can_platform.c

+0 −2
Original line number Diff line number Diff line
@@ -234,7 +234,6 @@ static int c_can_plat_probe(struct platform_device *pdev) 
	return 0;



exit_free_device:

	platform_set_drvdata(pdev, NULL);

	free_c_can_dev(dev);

exit_iounmap:

	iounmap(addr);
@@ -255,7 +254,6 @@ static int c_can_plat_remove(struct platform_device *pdev) 
	struct resource *mem;



	unregister_c_can_dev(dev);

	platform_set_drvdata(pdev, NULL);



	free_c_can_dev(dev);

	iounmap(priv->base);

drivers/net/can/flexcan.c

+0 −1
Original line number Diff line number Diff line
@@ -1127,7 +1127,6 @@ static int flexcan_remove(struct platform_device *pdev) 
	struct resource *mem;



	unregister_flexcandev(dev);

	platform_set_drvdata(pdev, NULL);

	iounmap(priv->base);



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

drivers/net/can/grcan.c

+3 −4
Original line number Diff line number Diff line
@@ -1683,10 +1683,9 @@ static int grcan_probe(struct platform_device *ofdev) 
	}



	res = platform_get_resource(ofdev, IORESOURCE_MEM, 0);

	base = devm_request_and_ioremap(&ofdev->dev, res);

	if (!base) {

		dev_err(&ofdev->dev, "couldn't map IO resource\n");

		err = -EADDRNOTAVAIL;

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

	if (IS_ERR(base)) {

		err = PTR_ERR(base);

		goto exit_error;

	}

drivers/net/can/ti_hecc.c

+0 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,6 @@ static int ti_hecc_remove(struct platform_device *pdev) 
	iounmap(priv->base);

	release_mem_region(res->start, resource_size(res));

	free_candev(ndev);

	platform_set_drvdata(pdev, NULL);



	return 0;

}