Replacing this and fixing the block comment format in this
function fixes checkpatch warnings.
Signed-off-by: Marcelo Diop-Gonzalez <marcgonzalez@xxxxxxxxxx>
---
.../vc04_services/interface/vchiq_arm/vchiq_arm.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
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 319e7aa0e0e0..942b4768c88e 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,
@@ -2098,9 +2098,11 @@ vchiq_dump(void *dump_context, const char *str, int len)
context->actual += copy_bytes;
len -= copy_bytes;
- /* If tne terminating NUL is included in the length, then it
- ** marks the end of a line and should be replaced with a
- ** carriage return. */
+ /*
+ * If the terminating NUL is included in the length, then it
+ * marks the end of a line and should be replaced with a
+ * carriage return.
+ */
if ((len == 0) && (str[copy_bytes - 1] == '\0')) {
char cr = '\n';
--
2.20.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
