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

Commit f8cabc36 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] media: sh_mobile_csi2: use managed memory and resource allocations 



Use managed allocations to simplify error handling and clean up paths.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent cea4c9e4

drivers/media/platform/soc_camera/sh_mobile_csi2.c

+4 −19
Original line number Diff line number Diff line
@@ -318,23 +318,16 @@ static __devinit int sh_csi2_probe(struct platform_device *pdev) 
		return -EINVAL;

	}



	priv = kzalloc(sizeof(struct sh_csi2), GFP_KERNEL);

	priv = devm_kzalloc(&pdev->dev, sizeof(struct sh_csi2), GFP_KERNEL);

	if (!priv)

		return -ENOMEM;



	priv->irq = irq;



	if (!request_mem_region(res->start, resource_size(res), pdev->name)) {

		dev_err(&pdev->dev, "CSI2 register region already claimed\n");

		ret = -EBUSY;

		goto ereqreg;

	}



	priv->base = ioremap(res->start, resource_size(res));

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

	if (!priv->base) {

		ret = -ENXIO;

		dev_err(&pdev->dev, "Unable to ioremap CSI2 registers.\n");

		goto eremap;

		return -ENXIO;

	}



	priv->pdev = pdev;
@@ -357,11 +350,7 @@ static __devinit int sh_csi2_probe(struct platform_device *pdev) 
	return 0;



esdreg:

	iounmap(priv->base);

eremap:

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

ereqreg:

	kfree(priv);

	platform_set_drvdata(pdev, NULL);



	return ret;

}
@@ -369,14 +358,10 @@ static __devinit int sh_csi2_probe(struct platform_device *pdev) 
static __devexit int sh_csi2_remove(struct platform_device *pdev)

{

	struct sh_csi2 *priv = platform_get_drvdata(pdev);

	struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);



	v4l2_device_unregister_subdev(&priv->subdev);

	pm_runtime_disable(&pdev->dev);

	iounmap(priv->base);

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

	platform_set_drvdata(pdev, NULL);

	kfree(priv);



	return 0;

}