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

Commit 8f05232f authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

[media] atmel-isi: tag dma_addr_t as such 



Instead of using u32 for DMA address, use the proper
Kernel type for it.

   drivers/media/platform/soc_camera/atmel-isi.c: In function 'atmel_isi_probe':
>> drivers/media/platform/soc_camera/atmel-isi.c:981:26: warning: passing argument 3 of 'dma_alloc_attrs' from incompatible pointer type
     isi->p_fb_descriptors = dma_alloc_coherent(&pdev->dev,
                             ^

Reported-by: default avatarkbuild test robot <fengguang.wu@intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <m.chehab@samsung.com>
parent 14bb9b04

drivers/media/platform/soc_camera/atmel-isi.c

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static void set_dma_ctrl(struct fbd *fb_desc, u32 ctrl) 
struct isi_dma_desc {

	struct list_head list;

	struct fbd *p_fbd;

	u32 fbd_phys;

	dma_addr_t fbd_phys;

};



/* Frame buffer data */
@@ -75,7 +75,7 @@ struct atmel_isi { 


	/* Allocate descriptors for dma buffer use */

	struct fbd			*p_fb_descriptors;

	u32				fb_descriptors_phys;

	dma_addr_t			fb_descriptors_phys;

	struct				list_head dma_desc_head;

	struct isi_dma_desc		dma_desc[MAX_BUFFER_NUM];
@@ -169,7 +169,7 @@ static irqreturn_t atmel_isi_handle_streaming(struct atmel_isi *isi) 
		isi->active = list_entry(isi->video_buffer_list.next,

					struct frame_buffer, list);

		isi_writel(isi, ISI_DMA_C_DSCR,

			isi->active->p_dma_desc->fbd_phys);

			(u32)isi->active->p_dma_desc->fbd_phys);

		isi_writel(isi, ISI_DMA_C_CTRL,

			ISI_DMA_CTRL_FETCH | ISI_DMA_CTRL_DONE);

		isi_writel(isi, ISI_DMA_CHER, ISI_DMA_CHSR_C_CH);
@@ -346,7 +346,7 @@ static void start_dma(struct atmel_isi *isi, struct frame_buffer *buffer) 
		return;

	}



	isi_writel(isi, ISI_DMA_C_DSCR, buffer->p_dma_desc->fbd_phys);

	isi_writel(isi, ISI_DMA_C_DSCR, (u32)buffer->p_dma_desc->fbd_phys);

	isi_writel(isi, ISI_DMA_C_CTRL, ISI_DMA_CTRL_FETCH | ISI_DMA_CTRL_DONE);

	isi_writel(isi, ISI_DMA_CHER, ISI_DMA_CHSR_C_CH);