OSDN Git Service

staging: vchiq_dump: Replace min with min_t
authorMarcelo Diop-Gonzalez <marcgonzalez@google.com>
Wed, 20 Nov 2019 20:21:00 +0000 (15:21 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 22 Nov 2019 10:32:54 +0000 (11:32 +0100)
Replacing this fixes checkpatch warnings.

Signed-off-by: Marcelo Diop-Gonzalez <marcgonzalez@google.com>
Link: https://lore.kernel.org/r/20191120202102.249121-3-marcgonzalez@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c

index 6328abc..942b476 100644 (file)
@@ -2081,7 +2081,7 @@ vchiq_dump(void *dump_context, const char *str, int len)
                int copy_bytes;
 
                if (context->offset > 0) {
-                       int skip_bytes = min(len, (int)context->offset);
+                       int skip_bytes = min_t(int, len, context->offset);
 
                        str += skip_bytes;
                        len -= skip_bytes;
@@ -2089,7 +2089,7 @@ vchiq_dump(void *dump_context, const char *str, int len)
                        if (context->offset > 0)
                                return;
                }
-               copy_bytes = min(len, (int)(context->space - context->actual));
+               copy_bytes = min_t(int, len, context->space - context->actual);
                if (copy_bytes == 0)
                        return;
                if (copy_to_user(context->buf + context->actual, str,