]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
accel/qaic: Fix mismatched types in min()
authorZack McKevitt <zmckevit@qti.qualcomm.com>
Wed, 15 Oct 2025 15:37:15 +0000 (17:37 +0200)
committerJeff Hugo <jeff.hugo@oss.qualcomm.com>
Mon, 20 Oct 2025 14:38:42 +0000 (08:38 -0600)
Use min_t() instead of min() to resolve compiler warnings for mismatched
types.

Signed-off-by: Zack McKevitt <zmckevit@qti.qualcomm.com>
Signed-off-by: Youssef Samir <youssef.abdulrahman@oss.qualcomm.com>
Reviewed-by: Carl Vanderlip <carl.vanderlip@oss.qualcomm.com>
Reviewed-by: Jeff Hugo <jeff.hugo@oss.qualcomm.com>
Reviewed-by: Maciej Falkowski <maciej.falkowski@linux.intel.com>
Signed-off-by: Jeff Hugo <jeff.hugo@oss.qualcomm.com>
Link: https://lore.kernel.org/r/20251015153715.184143-1-youssef.abdulrahman@oss.qualcomm.com
drivers/accel/qaic/sahara.c

index b78f0106ddb058b001b86bb61709d1ef6ad95e57..d5d16cd0d50d462bbe3b1a2c970e4f44bd42eefe 100644 (file)
@@ -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;