From ddf70cb6f8672ab7da965cbfa3560d673486cb89 Mon Sep 17 00:00:00 2001 From: Zack McKevitt Date: Wed, 15 Oct 2025 17:37:15 +0200 Subject: [PATCH] accel/qaic: Fix mismatched types in min() Use min_t() instead of min() to resolve compiler warnings for mismatched types. Signed-off-by: Zack McKevitt Signed-off-by: Youssef Samir Reviewed-by: Carl Vanderlip Reviewed-by: Jeff Hugo Reviewed-by: Maciej Falkowski Signed-off-by: Jeff Hugo Link: https://lore.kernel.org/r/20251015153715.184143-1-youssef.abdulrahman@oss.qualcomm.com --- drivers/accel/qaic/sahara.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/accel/qaic/sahara.c b/drivers/accel/qaic/sahara.c index b78f0106ddb05..d5d16cd0d50d4 100644 --- a/drivers/accel/qaic/sahara.c +++ b/drivers/accel/qaic/sahara.c @@ -657,7 +657,7 @@ static void sahara_parse_dump_table(struct sahara_context *context) /* Request the first chunk of the first image */ context->dump_image = &image_out_table[0]; - dump_length = min(context->dump_image->length, SAHARA_READ_MAX_SIZE); + dump_length = min_t(u64, context->dump_image->length, SAHARA_READ_MAX_SIZE); /* Avoid requesting EOI sized data so that we can identify errors */ if (dump_length == SAHARA_END_OF_IMAGE_LENGTH) dump_length = SAHARA_END_OF_IMAGE_LENGTH / 2; @@ -705,7 +705,7 @@ static void sahara_parse_dump_image(struct sahara_context *context) /* Get next image chunk */ dump_length = context->dump_image->length - context->dump_image_offset; - dump_length = min(dump_length, SAHARA_READ_MAX_SIZE); + dump_length = min_t(u64, dump_length, SAHARA_READ_MAX_SIZE); /* Avoid requesting EOI sized data so that we can identify errors */ if (dump_length == SAHARA_END_OF_IMAGE_LENGTH) dump_length = SAHARA_END_OF_IMAGE_LENGTH / 2; -- 2.47.3