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

Commit 8efdb135 authored by Sachin Kamat's avatar Sachin Kamat Committed by Mauro Carvalho Chehab
Browse files

[media] soc_camera/pxa_camera: Convert to devm_ioremap_resource() 



Use the newly introduced devm_ioremap_resource() instead of
devm_request_and_ioremap() which provides more consistent error handling.

Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2e2d612d

drivers/media/platform/soc_camera/pxa_camera.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/io.h>

#include <linux/io.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/dma-mapping.h>

#include <linux/dma-mapping.h>

#include <linux/err.h>

#include <linux/errno.h>

#include <linux/errno.h>

#include <linux/fs.h>

#include <linux/fs.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>
@@ -1710,9 +1711,10 @@ static int pxa_camera_probe(struct platform_device *pdev) 
	/*

	/*

	 * Request the regions.

	 * Request the regions.

	 */

	 */

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

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

	if (!base)

	if (IS_ERR(base))

		return -ENOMEM;

		return PTR_ERR(base);



	pcdev->irq = irq;

	pcdev->irq = irq;

	pcdev->base = base;

	pcdev->base = base;