CRIS: Return something from profile write
authorJesper Nilsson <jesper.nilsson@axis.com>
Wed, 4 Aug 2010 09:44:08 +0000 (11:44 +0200)
committerJesper Nilsson <jesper.nilsson@axis.com>
Wed, 4 Aug 2010 11:02:40 +0000 (13:02 +0200)
Even if it doesn't matter, we should return something.
Also, clean up some formatting.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
arch/cris/kernel/profile.c

index b917549..195ec5f 100644 (file)
@@ -9,12 +9,11 @@
 
 #define SAMPLE_BUFFER_SIZE 8192
 
-static charsample_buffer;
-static charsample_buffer_pos;
+static char *sample_buffer;
+static char *sample_buffer_pos;
 static int prof_running = 0;
 
-void
-cris_profile_sample(struct pt_regs* regs)
+void cris_profile_sample(struct pt_regs *regs)
 {
        if (!prof_running)
                return;
@@ -24,7 +23,7 @@ cris_profile_sample(struct pt_regs* regs)
        else
                *(unsigned int*)sample_buffer_pos = 0;
 
-       *(unsigned int*)(sample_buffer_pos + 4) = instruction_pointer(regs);
+       *(unsigned int *)(sample_buffer_pos + 4) = instruction_pointer(regs);
        sample_buffer_pos += 8;
 
        if (sample_buffer_pos == sample_buffer + SAMPLE_BUFFER_SIZE)
@@ -54,6 +53,7 @@ write_cris_profile(struct file *file, const char __user *buf,
 {
        sample_buffer_pos = sample_buffer;
        memset(sample_buffer, 0, SAMPLE_BUFFER_SIZE);
+       return count < SAMPLE_BUFFER_SIZE ? count : SAMPLE_BUFFER_SIZE;
 }
 
 static const struct file_operations cris_proc_profile_operations = {
@@ -61,8 +61,7 @@ static const struct file_operations cris_proc_profile_operations = {
        .write          = write_cris_profile,
 };
 
-static int
-__init init_cris_profile(void)
+static int __init init_cris_profile(void)
 {
        struct proc_dir_entry *entry;
 
@@ -82,5 +81,5 @@ __init init_cris_profile(void)
 
        return 0;
 }
-
 __initcall(init_cris_profile);
+