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

Commit fd8308b4 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] omap3isp: Use devm_ioremap_resource() 



Replace devm_request_mem_region() and devm_ioremap_nocache() with
devm_ioremap_resource(). The behaviour remains the same and the code is
simplified.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarSakari Ailus <sakari.ailus@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent f8e2ff26

drivers/media/platform/omap3isp/isp.c

+5 −20
Original line number Diff line number Diff line
@@ -2130,28 +2130,13 @@ static int isp_map_mem_resource(struct platform_device *pdev, 
	/* request the mem region for the camera registers */



	mem = platform_get_resource(pdev, IORESOURCE_MEM, res);

	if (!mem) {

		dev_err(isp->dev, "no mem resource?\n");

		return -ENODEV;

	}



	if (!devm_request_mem_region(isp->dev, mem->start, resource_size(mem),

				     pdev->name)) {

		dev_err(isp->dev,

			"cannot reserve camera register I/O region\n");

		return -ENODEV;

	}

	isp->mmio_base_phys[res] = mem->start;

	isp->mmio_size[res] = resource_size(mem);



	/* map the region */

	isp->mmio_base[res] = devm_ioremap_nocache(isp->dev,

						   isp->mmio_base_phys[res],

						   isp->mmio_size[res]);

	if (!isp->mmio_base[res]) {

		dev_err(isp->dev, "cannot map camera register I/O region\n");

		return -ENODEV;

	}

	isp->mmio_base[res] = devm_ioremap_resource(isp->dev, mem);

	if (IS_ERR(isp->mmio_base[res]))

		return PTR_ERR(isp->mmio_base[res]);



	isp->mmio_base_phys[res] = mem->start;



	return 0;

}

drivers/media/platform/omap3isp/isp.h

+0 −2
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ struct isp_xclk { 
 *             regions.

 * @mmio_base_phys: Array with physical L4 bus addresses for ISP register

 *                  regions.

 * @mmio_size: Array with ISP register regions size in bytes.

 * @stat_lock: Spinlock for handling statistics

 * @isp_mutex: Mutex for serializing requests to ISP.

 * @crashed: Bitmask of crashed entities (indexed by entity ID)
@@ -188,7 +187,6 @@ struct isp_device { 


	void __iomem *mmio_base[OMAP3_ISP_IOMEM_LAST];

	unsigned long mmio_base_phys[OMAP3_ISP_IOMEM_LAST];

	resource_size_t mmio_size[OMAP3_ISP_IOMEM_LAST];



	/* ISP Obj */

	spinlock_t stat_lock;	/* common lock for statistic drivers */