aboutsummaryrefslogtreecommitdiff
path: root/drivers/staging/comedi/proc.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2010-05-03 15:32:04 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-11 11:36:03 -0700
commit22d114248be8907f965e68a1bfdcea3302cbc776 (patch)
tree81f73d3048512269b26248b09b864829c635aff7 /drivers/staging/comedi/proc.c
parent09372df0dff51121e772ca5870fb565a08840c86 (diff)
Staging: comedi: clean up sparse issues in proc.c
The whole file should be converted to use seqfile, if it's even still needed. Or move to debugfs. Anyway, I fixed up the minor issues here. Cc: Ian Abbott <abbotti@mev.co.uk> Cc: Frank Mori Hess <fmhess@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/proc.c')
-rw-r--r--drivers/staging/comedi/proc.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/comedi/proc.c b/drivers/staging/comedi/proc.c
index c0035cb759a..2aa487b6018 100644
--- a/drivers/staging/comedi/proc.c
+++ b/drivers/staging/comedi/proc.c
@@ -32,10 +32,11 @@
#include "comedidev.h"
#include "comedi_fops.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)
+#ifdef CONFIG_PROC_FS
+static int comedi_read(char *buf, char **start, off_t offset, int len,
+ int *eof, void *data)
{
int i;
int devices_q = 0;
@@ -82,18 +83,17 @@ int comedi_read_procmem(char *buf, char **start, off_t offset, int len,
return l;
}
-#ifdef CONFIG_PROC_FS
void comedi_proc_init(void)
{
struct proc_dir_entry *comedi_proc;
- comedi_proc = create_proc_entry("comedi", S_IFREG | S_IRUGO, 0);
+ comedi_proc = create_proc_entry("comedi", S_IFREG | S_IRUGO, NULL);
if (comedi_proc)
- comedi_proc->read_proc = comedi_read_procmem;
+ comedi_proc->read_proc = comedi_read;
}
void comedi_proc_cleanup(void)
{
- remove_proc_entry("comedi", 0);
+ remove_proc_entry("comedi", NULL);
}
#endif