Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[pandora-kernel.git] / arch / mips / lasat / picvue_proc.c

diff --git a/arch/mips/lasat/picvue_proc.c b/arch/mips/lasat/picvue_proc.c
index cce7cdd..0bb6037 100644 (file)
--- a/arch/mips/lasat/picvue_proc.c
+++ b/arch/mips/lasat/picvue_proc.c
@@ -13,55 +13,59 @@
 #include <linux/interrupt.h>
 
 #include <linux/timer.h>
+#include <linux/mutex.h>
 
 #include "picvue.h"
 
+static DEFINE_MUTEX(pvc_mutex);
 static char pvc_lines[PVC_NLINES][PVC_LINELEN+1];
 static int pvc_linedata[PVC_NLINES];
 static struct proc_dir_entry *pvc_display_dir;
 static char *pvc_linename[PVC_NLINES] = {"line1", "line2"};
 #define DISPLAY_DIR_NAME "display"
-static int scroll_dir = 0, scroll_interval = 0;
+static int scroll_dir, scroll_interval;
 
 static struct timer_list timer;
 
-static void pvc_display(unsigned long data) {
+static void pvc_display(unsigned long data)
+{
        int i;
 
        pvc_clear();
-       for (i=0; i<PVC_NLINES; i++)
+       for (i = 0; i < PVC_NLINES; i++)
                pvc_write_string(pvc_lines[i], 0, i);
 }
 
 static DECLARE_TASKLET(pvc_display_tasklet, &pvc_display, 0);
 
 static int pvc_proc_read_line(char *page, char **start,
-                             off_t off, int count,
-                             int *eof, void *data)
+                            off_t off, int count,
+                            int *eof, void *data)
 {
-        char *origpage = page;
+       char *origpage = page;
        int lineno = *(int *)data;
 
        if (lineno < 0 || lineno > PVC_NLINES) {
-               printk("proc_read_line: invalid lineno %d\n", lineno);
+               printk(KERN_WARNING "proc_read_line: invalid lineno %d\n", lineno);
                return 0;
        }
 
-       down(&pvc_sem);
-        page += sprintf(page, "%s\n", pvc_lines[lineno]);
-       up(&pvc_sem);
+       mutex_lock(&pvc_mutex);
+       page += sprintf(page, "%s\n", pvc_lines[lineno]);
+       mutex_unlock(&pvc_mutex);
 
-        return page - origpage;
+       return page - origpage;
 }
 
 static int pvc_proc_write_line(struct file *file, const char *buffer,
-                           unsigned long count, void *data)
+                          unsigned long count, void *data)
 {
-        int origcount = count;
+       int origcount = count;
        int lineno = *(int *)data;
 
        if (lineno < 0 || lineno > PVC_NLINES) {
-               printk("proc_write_line: invalid lineno %d\n", lineno);
+               printk(KERN_WARNING "proc_write_line: invalid lineno %d\n",
+                      lineno);
                return origcount;
        }
 
@@ -71,23 +75,23 @@ static int pvc_proc_write_line(struct file *file, const char *buffer,
        if (buffer[count-1] == '\n')
                count--;
 
-       down(&pvc_sem);
+       mutex_lock(&pvc_mutex);
        strncpy(pvc_lines[lineno], buffer, count);
        pvc_lines[lineno][count] = '\0';
-       up(&pvc_sem);
+       mutex_unlock(&pvc_mutex);
 
        tasklet_schedule(&pvc_display_tasklet);
 
-        return origcount;
+       return origcount;
 }
 
 static int pvc_proc_write_scroll(struct file *file, const char *buffer,
-                           unsigned long count, void *data)
+                          unsigned long count, void *data)
 {
-        int origcount = count;
+       int origcount = count;
        int cmd = simple_strtol(buffer, NULL, 10);
 
-       down(&pvc_sem);
+       mutex_lock(&pvc_mutex);
        if (scroll_interval != 0)
                del_timer(&timer);
 
@@ -104,22 +108,22 @@ static int pvc_proc_write_scroll(struct file *file, const char *buffer,
                }
                add_timer(&timer);
        }
-       up(&pvc_sem);
+       mutex_unlock(&pvc_mutex);
 
-        return origcount;
+       return origcount;
 }
 
 static int pvc_proc_read_scroll(char *page, char **start,
-                             off_t off, int count,
-                             int *eof, void *data)
+                            off_t off, int count,
+                            int *eof, void *data)
 {
-        char *origpage = page;
+       char *origpage = page;
 
-       down(&pvc_sem);
-        page += sprintf(page, "%d\n", scroll_dir * scroll_interval);
-       up(&pvc_sem);
+       mutex_lock(&pvc_mutex);
+       page += sprintf(page, "%d\n", scroll_dir * scroll_interval);
+       mutex_unlock(&pvc_mutex);
 
-        return page - origpage;
+       return page - origpage;
 }
 
 
@@ -137,7 +141,7 @@ void pvc_proc_timerfunc(unsigned long data)
 static void pvc_proc_cleanup(void)
 {
        int i;
-       for (i=0; i<PVC_NLINES; i++)
+       for (i = 0; i < PVC_NLINES; i++)
                remove_proc_entry(pvc_linename[i], pvc_display_dir);
        remove_proc_entry("scroll", pvc_display_dir);
        remove_proc_entry(DISPLAY_DIR_NAME, NULL);
@@ -154,14 +158,16 @@ static int __init pvc_proc_init(void)
        if (pvc_display_dir == NULL)
                goto error;
 
-       for (i=0; i<PVC_NLINES; i++) {
+       for (i = 0; i < PVC_NLINES; i++) {
                strcpy(pvc_lines[i], "");
                pvc_linedata[i] = i;
        }
-       for (i=0; i<PVC_NLINES; i++) {
-               proc_entry = create_proc_entry(pvc_linename[i], 0644, pvc_display_dir);
+       for (i = 0; i < PVC_NLINES; i++) {
+               proc_entry = create_proc_entry(pvc_linename[i], 0644,
+                                              pvc_display_dir);
                if (proc_entry == NULL)
                        goto error;
+
                proc_entry->read_proc = pvc_proc_read_line;
                proc_entry->write_proc = pvc_proc_write_line;
                proc_entry->data = &pvc_linedata[i];
@@ -169,6 +175,7 @@ static int __init pvc_proc_init(void)
        proc_entry = create_proc_entry("scroll", 0644, pvc_display_dir);
        if (proc_entry == NULL)
                goto error;
+
        proc_entry->write_proc = pvc_proc_write_scroll;
        proc_entry->read_proc = pvc_proc_read_scroll;