diff options
Diffstat (limited to 'drivers/staging/comedi/proc.c')
| -rw-r--r-- | drivers/staging/comedi/proc.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/drivers/staging/comedi/proc.c b/drivers/staging/comedi/proc.c index 5a2b72d87572..36ae2cd92ad9 100644 --- a/drivers/staging/comedi/proc.c +++ b/drivers/staging/comedi/proc.c @@ -31,12 +31,12 @@ #define __NO_VERSION__ #include "comedidev.h" #include <linux/proc_fs.h> -//#include <linux/string.h> +/* #include <linux/string.h> */ int comedi_read_procmem(char *buf, char **start, off_t offset, int len, int *eof, void *data); -extern comedi_driver *comedi_drivers; +extern struct comedi_driver *comedi_drivers; int comedi_read_procmem(char *buf, char **start, off_t offset, int len, int *eof, void *data) @@ -44,7 +44,7 @@ int comedi_read_procmem(char *buf, char **start, off_t offset, int len, int i; int devices_q = 0; int l = 0; - comedi_driver *driv; + struct comedi_driver *driv; l += sprintf(buf + l, "comedi version " COMEDI_RELEASE "\n" @@ -53,9 +53,10 @@ int comedi_read_procmem(char *buf, char **start, off_t offset, int len, for (i = 0; i < COMEDI_NUM_BOARD_MINORS; i++) { struct comedi_device_file_info *dev_file_info = comedi_get_device_file_info(i); - comedi_device *dev; + struct comedi_device *dev; - if(dev_file_info == NULL) continue; + if (dev_file_info == NULL) + continue; dev = dev_file_info->device; if (dev->attached) { @@ -66,9 +67,8 @@ int comedi_read_procmem(char *buf, char **start, off_t offset, int len, dev->board_name, dev->n_subdevices); } } - if (!devices_q) { + if (!devices_q) l += sprintf(buf + l, "no devices\n"); - } for (driv = comedi_drivers; driv; driv = driv->next) { l += sprintf(buf + l, "%s:\n", driv->driver_name); @@ -77,9 +77,8 @@ int comedi_read_procmem(char *buf, char **start, off_t offset, int len, *(char **)((char *)driv->board_name + i * driv->offset)); } - if (!driv->num_names) { + if (!driv->num_names) l += sprintf(buf + l, " %s\n", driv->driver_name); - } } return l; |