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

Commit c6bf7e5f authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Marc Kleine-Budde
Browse files

can: c_can: convert to use devm * api 



This patch uses devm_* APIs as they are device managed and make code simpler.

Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 0854a7f1

drivers/net/can/c_can/c_can_platform.c

+10 −33
Original line number Diff line number Diff line
@@ -208,40 +208,31 @@ static int c_can_plat_probe(struct platform_device *pdev) 
	}



	/* get the appropriate clk */

	clk = clk_get(&pdev->dev, NULL);

	clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(clk)) {

		dev_err(&pdev->dev, "no clock defined\n");

		ret = -ENODEV;

		ret = PTR_ERR(clk);

		goto exit;

	}



	/* get the platform data */

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	irq = platform_get_irq(pdev, 0);

	if (!mem || irq <= 0) {

	if (irq <= 0) {

		ret = -ENODEV;

		goto exit_free_clk;

	}



	if (!request_mem_region(mem->start, resource_size(mem),

				KBUILD_MODNAME)) {

		dev_err(&pdev->dev, "resource unavailable\n");

		ret = -ENODEV;

		goto exit_free_clk;

		goto exit;

	}



	addr = ioremap(mem->start, resource_size(mem));

	if (!addr) {

		dev_err(&pdev->dev, "failed to map can port\n");

		ret = -ENOMEM;

		goto exit_release_mem;

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	addr = devm_ioremap_resource(&pdev->dev, mem);

	if (IS_ERR(addr)) {

		ret =  PTR_ERR(addr);

		goto exit;

	}



	/* allocate the c_can device */

	dev = alloc_c_can_dev();

	if (!dev) {

		ret = -ENOMEM;

		goto exit_iounmap;

		goto exit;

	}



	priv = netdev_priv(dev);
@@ -321,12 +312,6 @@ static int c_can_plat_probe(struct platform_device *pdev) 


exit_free_device:

	free_c_can_dev(dev);

exit_iounmap:

	iounmap(addr);

exit_release_mem:

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

exit_free_clk:

	clk_put(clk);

exit:

	dev_err(&pdev->dev, "probe failed\n");
@@ -336,18 +321,10 @@ static int c_can_plat_probe(struct platform_device *pdev) 
static int c_can_plat_remove(struct platform_device *pdev)

{

	struct net_device *dev = platform_get_drvdata(pdev);

	struct c_can_priv *priv = netdev_priv(dev);

	struct resource *mem;



	unregister_c_can_dev(dev);



	free_c_can_dev(dev);

	iounmap(priv->base);



	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

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



	clk_put(priv->priv);



	return 0;

}