From: Marcelo Diop-Gonzalez Date: Wed, 20 Nov 2019 20:21:00 +0000 (-0500) Subject: staging: vchiq_dump: Replace min with min_t X-Git-Tag: v5.5-rc1~135^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96a8b2912fe56f49193879a771baf214b4f209e4;p=thirdparty%2Fkernel%2Flinux.git staging: vchiq_dump: Replace min with min_t Replacing this fixes checkpatch warnings. Signed-off-by: Marcelo Diop-Gonzalez Link: https://lore.kernel.org/r/20191120202102.249121-3-marcgonzalez@google.com Signed-off-by: Greg Kroah-Hartman --- 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 6328abcaeeeb4..942b4768c88e7 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -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,