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

media: ti-vpe: cal: Store buffer DMA address in dma_addr_t 



dma_addr_t is the correct type to store DMA addresses. Replace incorrect
usage of unsigned long and unsigned int.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: default avatarBenoit Parrot <bparrot@ti.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 2e2279b5

drivers/media/platform/ti-vpe/cal-video.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static int cal_start_streaming(struct vb2_queue *vq, unsigned int count) 
{

	struct cal_ctx *ctx = vb2_get_drv_priv(vq);

	struct cal_buffer *buf;

	unsigned long addr;

	dma_addr_t addr;

	int ret;



	spin_lock_irq(&ctx->dma.lock);

drivers/media/platform/ti-vpe/cal.c

+3 −3
Original line number Diff line number Diff line
@@ -406,9 +406,9 @@ void cal_ctx_wr_dma_config(struct cal_ctx *ctx) 
	ctx_dbg(3, ctx, "CAL_CTRL = 0x%08x\n", cal_read(ctx->cal, CAL_CTRL));

}



void cal_ctx_wr_dma_addr(struct cal_ctx *ctx, unsigned int dmaaddr)

void cal_ctx_wr_dma_addr(struct cal_ctx *ctx, dma_addr_t addr)

{

	cal_write(ctx->cal, CAL_WR_DMA_ADDR(ctx->index), dmaaddr);

	cal_write(ctx->cal, CAL_WR_DMA_ADDR(ctx->index), addr);

}



void cal_ctx_wr_dma_disable(struct cal_ctx *ctx)
@@ -491,7 +491,7 @@ static inline void cal_irq_wdma_start(struct cal_ctx *ctx) 
		 * hardware.

		 */

		struct cal_buffer *buf;

		unsigned long addr;

		dma_addr_t addr;



		buf = list_first_entry(&ctx->dma.queue, struct cal_buffer,

				       list);

drivers/media/platform/ti-vpe/cal.h

+1 −1
Original line number Diff line number Diff line
@@ -299,7 +299,7 @@ void cal_camerarx_destroy(struct cal_camerarx *phy); 
void cal_ctx_csi2_config(struct cal_ctx *ctx);

void cal_ctx_pix_proc_config(struct cal_ctx *ctx);

void cal_ctx_wr_dma_config(struct cal_ctx *ctx);

void cal_ctx_wr_dma_addr(struct cal_ctx *ctx, unsigned int dmaaddr);

void cal_ctx_wr_dma_addr(struct cal_ctx *ctx, dma_addr_t addr);

void cal_ctx_wr_dma_disable(struct cal_ctx *ctx);

int cal_ctx_wr_dma_stop(struct cal_ctx *ctx);

void cal_ctx_enable_irqs(struct cal_ctx *ctx);