Merge commit 'v2.6.32-rc5' into for-linus

[mv-sheeva.git] / drivers / staging / comedi / proc.c

diff --git a/drivers/staging/comedi/proc.c b/drivers/staging/comedi/proc.c
index 36ae2cd92ad9f1bc5f34faa4bcd5a45f7e7c7bf1..5a22fe62c400b05049882b72eb529decfd750710 100644 (file)
--- a/drivers/staging/comedi/proc.c
+++ b/drivers/staging/comedi/proc.c
@@ -34,12 +34,12 @@
 /* #include <linux/string.h> */
 
 int comedi_read_procmem(char *buf, char **start, off_t offset, int len,
-       int *eof, void *data);
+                       int *eof, void *data);
 
 extern struct comedi_driver *comedi_drivers;
 
 int comedi_read_procmem(char *buf, char **start, off_t offset, int len,
-       int *eof, void *data)
+                       int *eof, void *data)
 {
        int i;
        int devices_q = 0;
@@ -47,12 +47,13 @@ int comedi_read_procmem(char *buf, char **start, off_t offset, int len,
        struct comedi_driver *driv;
 
        l += sprintf(buf + l,
-               "comedi version " COMEDI_RELEASE "\n"
-               "format string: %s\n",
-               "\"%2d: %-20s %-20s %4d\",i,driver_name,board_name,n_subdevices");
+                    "comedi version " COMEDI_RELEASE "\n"
+                    "format string: %s\n",
+                    "\"%2d: %-20s %-20s %4d\",i,driver_name,board_name,n_subdevices");
 
        for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) {
-               struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(i);
+               struct comedi_device_file_info *dev_file_info =
+                   comedi_get_device_file_info(i);
                struct comedi_device *dev;
 
                if (dev_file_info == NULL)
@@ -62,9 +63,9 @@ int comedi_read_procmem(char *buf, char **start, off_t offset, int len,
                if (dev->attached) {
                        devices_q = 1;
                        l += sprintf(buf + l, "%2d: %-20s %-20s %4d\n",
-                               i,
-                               dev->driver->driver_name,
-                               dev->board_name, dev->n_subdevices);
+                                    i,
+                                    dev->driver->driver_name,
+                                    dev->board_name, dev->n_subdevices);
                }
        }
        if (!devices_q)
@@ -74,8 +75,8 @@ int comedi_read_procmem(char *buf, char **start, off_t offset, int len,
                l += sprintf(buf + l, "%s:\n", driv->driver_name);
                for (i = 0; i < driv->num_names; i++) {
                        l += sprintf(buf + l, " %s\n",
-                               *(char **)((char *)driv->board_name +
-                                       i * driv->offset));
+                                    *(char **)((char *)driv->board_name +
+                                               i * driv->offset));
                }
                if (!driv->num_names)
                        l += sprintf(buf + l, " %s\n", driv->driver_name);