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

Commit 224ddca0 authored by Russell King's avatar Russell King
Browse files

DMA-API: media: omap3isp: use dma_coerce_mask_and_coherent() 



The code sequence:
	isp->raw_dmamask = DMA_BIT_MASK(32);
	isp->dev->dma_mask = &isp->raw_dmamask;
	isp->dev->coherent_dma_mask = DMA_BIT_MASK(32);
bypasses the architectures check on the DMA mask.  It can be replaced
with dma_coerce_mask_and_coherent(), avoiding the direct initialization
of this mask.

Acked-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 24353b8b

drivers/media/platform/omap3isp/isp.c

+3 −3
Original line number Diff line number Diff line
@@ -2182,9 +2182,9 @@ static int isp_probe(struct platform_device *pdev) 
	isp->pdata = pdata;

	isp->ref_count = 0;



	isp->raw_dmamask = DMA_BIT_MASK(32);

	isp->dev->dma_mask = &isp->raw_dmamask;

	isp->dev->coherent_dma_mask = DMA_BIT_MASK(32);

	ret = dma_coerce_mask_and_coherent(isp->dev, DMA_BIT_MASK(32));

	if (ret)

		return ret;



	platform_set_drvdata(pdev, isp);

drivers/media/platform/omap3isp/isp.h

+0 −3
Original line number Diff line number Diff line
@@ -152,7 +152,6 @@ struct isp_xclk { 
 * @mmio_base_phys: Array with physical L4 bus addresses for ISP register

 *                  regions.

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

 * @raw_dmamask: Raw DMA mask

 * @stat_lock: Spinlock for handling statistics

 * @isp_mutex: Mutex for serializing requests to ISP.

 * @crashed: Bitmask of crashed entities (indexed by entity ID)
@@ -190,8 +189,6 @@ struct isp_device { 
	unsigned long mmio_base_phys[OMAP3_ISP_IOMEM_LAST];

	resource_size_t mmio_size[OMAP3_ISP_IOMEM_LAST];



	u64 raw_dmamask;



	/* ISP Obj */

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

	struct mutex isp_mutex;	/* For handling ref_count field */