| Message ID | 20240610210220.95524-10-wahrenst@gmx.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | staging: vc04_services: Random cleanups | expand |
Hi Stefan, Thank you for the patch. On Mon, Jun 10, 2024 at 11:02:19PM +0200, Stefan Wahren wrote: > The kernel uses different types for DMA length & address, > so better use them. > > Signed-off-by: Stefan Wahren <wahrenst@gmx.net> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > index 706bfc7a0b90..02392073c4aa 100644 > --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c > @@ -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-
diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index 706bfc7a0b90..02392073c4aa 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -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-
The kernel uses different types for DMA length & address, so better use them. Signed-off-by: Stefan Wahren <wahrenst@gmx.net> --- .../staging/vc04_services/interface/vchiq_arm/vchiq_arm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.34.1