Commit fcc938c2 authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

staging: vchiq_arm: Don't cast scatter-gather elements 



The kernel uses different types for DMA length & address,
so better use them.

Signed-off-by: default avatarStefan Wahren <wahrenst@gmx.net>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://lore.kernel.org/r/20240621131958.98208-10-wahrenst@gmx.net


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0d49eee7

drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

+3 −3
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ cleanup_pagelistinfo(struct vchiq_instance *instance, struct vchiq_pagelist_info 
}



static inline bool

is_adjacent_block(u32 *addrs, u32 addr, unsigned int k)

is_adjacent_block(u32 *addrs, dma_addr_t addr, unsigned int k)

{

	u32 tmp;
@@ -377,8 +377,8 @@ create_pagelist(struct vchiq_instance *instance, char *buf, char __user *ubuf, 
	/* Combine adjacent blocks for performance */

	k = 0;

	for_each_sg(scatterlist, sg, dma_buffers, i) {

		u32 len = sg_dma_len(sg);

		u32 addr = sg_dma_address(sg);

		unsigned int len = sg_dma_len(sg);

		dma_addr_t addr = sg_dma_address(sg);



		/* Note: addrs is the address + page_count - 1

		 * The firmware expects blocks after the first to be page-