[v1] dma-buf: heaps: use max3() in dma_heap_ioctl

[PATCH] dma-buf: heaps: use max3() in dma_heap_ioctl

Posted by Thorsten Blum 1 month, 2 weeks ago

Replace two nested max() calls with a single max3() in dma_heap_ioctl().

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
 drivers/dma-buf/dma-heap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c
index ac5f8685a649..52eec2ebb2e8 100644
--- a/drivers/dma-buf/dma-heap.c
+++ b/drivers/dma-buf/dma-heap.c
@@ -153,7 +153,7 @@ static long dma_heap_ioctl(struct file *file, unsigned int ucmd,
 		in_size = 0;
 	if ((ucmd & kcmd & IOC_OUT) == 0)
 		out_size = 0;
-	ksize = max(max(in_size, out_size), drv_size);
+	ksize = max3(in_size, out_size, drv_size);
 
 	/* If necessary, allocate buffer for ioctl argument */
 	if (ksize > sizeof(stack_kdata)) {

Re: [PATCH] dma-buf: heaps: use max3() in dma_heap_ioctl

Posted by T.J. Mercier 1 month, 2 weeks ago

On Mon, Apr 27, 2026 at 10:26 AM Thorsten Blum <thorsten.blum@linux.dev> wrote:
>
> Replace two nested max() calls with a single max3() in dma_heap_ioctl().
>
> Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
> ---
>  drivers/dma-buf/dma-heap.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/dma-buf/dma-heap.c b/drivers/dma-buf/dma-heap.c
> index ac5f8685a649..52eec2ebb2e8 100644
> --- a/drivers/dma-buf/dma-heap.c
> +++ b/drivers/dma-buf/dma-heap.c
> @@ -153,7 +153,7 @@ static long dma_heap_ioctl(struct file *file, unsigned int ucmd,
>                 in_size = 0;
>         if ((ucmd & kcmd & IOC_OUT) == 0)
>                 out_size = 0;
> -       ksize = max(max(in_size, out_size), drv_size);
> +       ksize = max3(in_size, out_size, drv_size);

Hi,

Could you add #include <linux/minmax.h> as well? It's currently missing.

With that: Reviewed-by: T.J.Mercier <tjmercier@google.com>

Thanks,
T.J.