]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
sparc: switch /proc/led to seq_file
authorAlexey Dobriyan <adobriyan@gmail.com>
Tue, 3 Jun 2008 22:21:21 +0000 (15:21 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 3 Jun 2008 22:21:21 +0000 (15:21 -0700)
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/kernel/led.c

index 59e9344e7a0da2f5f0ccc8f4586e3ef89a85debe..adaaed4ea2fb6821ca2a85c7afe61d2a07208f1d 100644 (file)
@@ -2,6 +2,7 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/proc_fs.h>
+#include <linux/seq_file.h>
 #include <linux/string.h>
 #include <linux/jiffies.h>
 #include <linux/timer.h>
@@ -45,21 +46,22 @@ static void led_blink(unsigned long timeout)
        add_timer(&led_blink_timer);
 }
 
-static int led_read_proc(char *buf, char **start, off_t offset, int count,
-                        int *eof, void *data)
+static int led_proc_show(struct seq_file *m, void *v)
 {
-       int len = 0;
-
        if (get_auxio() & AUXIO_LED)
-               len = sprintf(buf, "on\n");
+               seq_puts(m, "on\n");
        else
-               len = sprintf(buf, "off\n");
+               seq_puts(m, "off\n");
+       return 0;
+}
 
-       return len;
+static int led_proc_open(struct inode *inode, struct file *file)
+{
+       return single_open(file, led_proc_show, NULL);
 }
 
-static int led_write_proc(struct file *file, const char __user *buffer,
-                         unsigned long count, void *data)
+static ssize_t led_proc_write(struct file *file, const char __user *buffer,
+                             size_t count, loff_t *ppos)
 {
        char *buf = NULL;
 
@@ -103,6 +105,15 @@ static int led_write_proc(struct file *file, const char __user *buffer,
        return count;
 }
 
+static const struct file_operations led_proc_fops = {
+       .owner          = THIS_MODULE,
+       .open           = led_proc_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = single_release,
+       .write          = led_proc_write,
+};
+
 static struct proc_dir_entry *led;
 
 #define LED_VERSION    "0.1"
@@ -112,12 +123,9 @@ static int __init led_init(void)
        init_timer(&led_blink_timer);
        led_blink_timer.function = led_blink;
 
-       led = create_proc_entry("led", 0, NULL);
+       led = proc_create("led", 0, NULL, &led_proc_fops);
        if (!led)
                return -ENOMEM;
-
-       led->read_proc = led_read_proc; /* reader function */
-       led->write_proc = led_write_proc; /* writer function */
        led->owner = THIS_MODULE;
 
        printk(KERN_INFO