mmc: dw_mmc: fix the max_blk_count in IDMAC

[firefly-linux-kernel-4.4.55.git] / drivers / gator / gator_annotate_kernel.c

diff --git a/drivers/gator/gator_annotate_kernel.c b/drivers/gator/gator_annotate_kernel.c
index 0108068255297285859854a15bc632579365de15..54e8e86e34cf32626e668aa479b2308187afe68c 100644 (file)
--- a/drivers/gator/gator_annotate_kernel.c
+++ b/drivers/gator/gator_annotate_kernel.c
@@ -1,5 +1,5 @@
 /**
- * Copyright (C) ARM Limited 2012-2014. All rights reserved.
+ * Copyright (C) ARM Limited 2012-2015. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -19,10 +19,11 @@ static void kannotate_write(const char *ptr, unsigned int size)
        int retval;
        int pos = 0;
        loff_t offset = 0;
+
        while (pos < size) {
                retval = annotate_write(NULL, &ptr[pos], size - pos, &offset);
                if (retval < 0) {
-                       printk(KERN_WARNING "gator: kannotate_write failed with return value %d\n", retval);
+                       pr_warning("gator: kannotate_write failed with return value %d\n", retval);
                        return;
                }
                pos += retval;
@@ -47,6 +48,7 @@ void gator_annotate_channel(int channel, const char *str)
 {
        const u16 str_size = strlen(str) & 0xffff;
        char header[8];
+
        header[0] = ESCAPE_CODE;
        header[1] = STRING_ANNOTATION;
        marshal_u32(header + 2, channel);
@@ -54,20 +56,19 @@ void gator_annotate_channel(int channel, const char *str)
        kannotate_write(header, sizeof(header));
        kannotate_write(str, str_size);
 }
-
 EXPORT_SYMBOL(gator_annotate_channel);
 
 void gator_annotate(const char *str)
 {
        gator_annotate_channel(0, str);
 }
-
 EXPORT_SYMBOL(gator_annotate);
 
 void gator_annotate_channel_color(int channel, int color, const char *str)
 {
        const u16 str_size = (strlen(str) + 4) & 0xffff;
        char header[12];
+
        header[0] = ESCAPE_CODE;
        header[1] = STRING_ANNOTATION;
        marshal_u32(header + 2, channel);
@@ -76,39 +77,37 @@ void gator_annotate_channel_color(int channel, int color, const char *str)
        kannotate_write(header, sizeof(header));
        kannotate_write(str, str_size - 4);
 }
-
 EXPORT_SYMBOL(gator_annotate_channel_color);
 
 void gator_annotate_color(int color, const char *str)
 {
        gator_annotate_channel_color(0, color, str);
 }
-
 EXPORT_SYMBOL(gator_annotate_color);
 
 void gator_annotate_channel_end(int channel)
 {
        char header[8];
+
        header[0] = ESCAPE_CODE;
        header[1] = STRING_ANNOTATION;
        marshal_u32(header + 2, channel);
        marshal_u16(header + 6, 0);
        kannotate_write(header, sizeof(header));
 }
-
 EXPORT_SYMBOL(gator_annotate_channel_end);
 
 void gator_annotate_end(void)
 {
        gator_annotate_channel_end(0);
 }
-
 EXPORT_SYMBOL(gator_annotate_end);
 
-void gator_annotate_name_channel(int channel, int group, const char* str)
+void gator_annotate_name_channel(int channel, int group, const char *str)
 {
        const u16 str_size = strlen(str) & 0xffff;
        char header[12];
+
        header[0] = ESCAPE_CODE;
        header[1] = NAME_CHANNEL_ANNOTATION;
        marshal_u32(header + 2, channel);
@@ -117,13 +116,13 @@ void gator_annotate_name_channel(int channel, int group, const char* str)
        kannotate_write(header, sizeof(header));
        kannotate_write(str, str_size);
 }
-
 EXPORT_SYMBOL(gator_annotate_name_channel);
 
-void gator_annotate_name_group(int group, const char* str)
+void gator_annotate_name_group(int group, const char *str)
 {
        const u16 str_size = strlen(str) & 0xffff;
        char header[8];
+
        header[0] = ESCAPE_CODE;
        header[1] = NAME_GROUP_ANNOTATION;
        marshal_u32(header + 2, group);
@@ -131,7 +130,6 @@ void gator_annotate_name_group(int group, const char* str)
        kannotate_write(header, sizeof(header));
        kannotate_write(str, str_size);
 }
-
 EXPORT_SYMBOL(gator_annotate_name_group);
 
 void gator_annotate_visual(const char *data, unsigned int length, const char *str)
@@ -139,6 +137,7 @@ void gator_annotate_visual(const char *data, unsigned int length, const char *st
        const u16 str_size = strlen(str) & 0xffff;
        char header[4];
        char header_length[4];
+
        header[0] = ESCAPE_CODE;
        header[1] = VISUAL_ANNOTATION;
        marshal_u16(header + 2, str_size);
@@ -148,49 +147,49 @@ void gator_annotate_visual(const char *data, unsigned int length, const char *st
        kannotate_write(header_length, sizeof(header_length));
        kannotate_write(data, length);
 }
-
 EXPORT_SYMBOL(gator_annotate_visual);
 
 void gator_annotate_marker(void)
 {
        char header[4];
+
        header[0] = ESCAPE_CODE;
        header[1] = MARKER_ANNOTATION;
        marshal_u16(header + 2, 0);
        kannotate_write(header, sizeof(header));
 }
-
 EXPORT_SYMBOL(gator_annotate_marker);
 
 void gator_annotate_marker_str(const char *str)
 {
        const u16 str_size = strlen(str) & 0xffff;
        char header[4];
+
        header[0] = ESCAPE_CODE;
        header[1] = MARKER_ANNOTATION;
        marshal_u16(header + 2, str_size);
        kannotate_write(header, sizeof(header));
        kannotate_write(str, str_size);
 }
-
 EXPORT_SYMBOL(gator_annotate_marker_str);
 
 void gator_annotate_marker_color(int color)
 {
        char header[8];
+
        header[0] = ESCAPE_CODE;
        header[1] = MARKER_ANNOTATION;
        marshal_u16(header + 2, 4);
        marshal_u32(header + 4, color);
        kannotate_write(header, sizeof(header));
 }
-
 EXPORT_SYMBOL(gator_annotate_marker_color);
 
 void gator_annotate_marker_color_str(int color, const char *str)
 {
        const u16 str_size = (strlen(str) + 4) & 0xffff;
        char header[8];
+
        header[0] = ESCAPE_CODE;
        header[1] = MARKER_ANNOTATION;
        marshal_u16(header + 2, str_size);
@@ -198,5 +197,4 @@ void gator_annotate_marker_color_str(int color, const char *str)
        kannotate_write(header, sizeof(header));
        kannotate_write(str, str_size - 4);
 }
-
 EXPORT_SYMBOL(gator_annotate_marker_color_str);