From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 30 Apr 2010 22:35:37 +0000 (-0700)
Subject: Staging: comedi: fix up coding style issues in range.c
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ecfe20db3e0e2ff9df4007c4f1d34b27a24265fd;p=linux-beck.git

Staging: comedi: fix up coding style issues in range.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c
index 188c47948033..c35ade94a12d 100644
--- a/drivers/staging/comedi/range.c
+++ b/drivers/staging/comedi/range.c
@@ -22,7 +22,7 @@
 */
 
 #include "comedidev.h"
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 const struct comedi_lrange range_bipolar10 = { 1, {BIP_RANGE(10)} };
 const struct comedi_lrange range_bipolar5 = { 1, {BIP_RANGE(5)} };
@@ -130,14 +130,10 @@ int check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist)
 			if (CR_CHAN(chanlist[i]) >= s->n_chan ||
 			    CR_RANGE(chanlist[i]) >= s->range_table->length
 			    || aref_invalid(s, chanlist[i])) {
-				printk
-				    ("bad chanlist[%d]=0x%08x n_chan=%d range length=%d\n",
-				     i, chanlist[i], s->n_chan,
-				     s->range_table->length);
-#if 0
-				for (i = 0; i < n; i++)
-					printk("[%d]=0x%08x\n", i, chanlist[i]);
-#endif
+				printk(KERN_ERR "bad chanlist[%d]=0x%08x "
+				       "in_chan=%d range length=%d\n", i,
+				       chanlist[i], s->n_chan,
+				       s->range_table->length);
 				return -EINVAL;
 			}
 	} else if (s->range_table_list) {
@@ -147,13 +143,13 @@ int check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist)
 			    CR_RANGE(chanlist[i]) >=
 			    s->range_table_list[chan]->length
 			    || aref_invalid(s, chanlist[i])) {
-				printk("bad chanlist[%d]=0x%08x\n", i,
-				       chanlist[i]);
+				printk(KERN_ERR "bad chanlist[%d]=0x%08x\n",
+				       i, chanlist[i]);
 				return -EINVAL;
 			}
 		}
 	} else {
-		printk("comedi: (bug) no range type list!\n");
+		printk(KERN_ERR "comedi: (bug) no range type list!\n");
 		return -EINVAL;
 	}
 	return 0;