diff options
author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-04-30 18:35:37 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-11 14:35:58 -0400 |
commit | ecfe20db3e0e2ff9df4007c4f1d34b27a24265fd (patch) | |
tree | f68430a0e22e2df88316d74c7e4fb97785516859 /drivers/staging/comedi/range.c | |
parent | 787ae4e26f3600c7d30693a92e18174a2d6363fc (diff) |
Staging: comedi: fix up coding style issues in range.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/comedi/range.c')
-rw-r--r-- | drivers/staging/comedi/range.c | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/drivers/staging/comedi/range.c b/drivers/staging/comedi/range.c index 188c4794803..c35ade94a12 100644 --- a/drivers/staging/comedi/range.c +++ b/drivers/staging/comedi/range.c | |||
@@ -22,7 +22,7 @@ | |||
22 | */ | 22 | */ |
23 | 23 | ||
24 | #include "comedidev.h" | 24 | #include "comedidev.h" |
25 | #include <asm/uaccess.h> | 25 | #include <linux/uaccess.h> |
26 | 26 | ||
27 | const struct comedi_lrange range_bipolar10 = { 1, {BIP_RANGE(10)} }; | 27 | const struct comedi_lrange range_bipolar10 = { 1, {BIP_RANGE(10)} }; |
28 | const struct comedi_lrange range_bipolar5 = { 1, {BIP_RANGE(5)} }; | 28 | 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) | |||
130 | if (CR_CHAN(chanlist[i]) >= s->n_chan || | 130 | if (CR_CHAN(chanlist[i]) >= s->n_chan || |
131 | CR_RANGE(chanlist[i]) >= s->range_table->length | 131 | CR_RANGE(chanlist[i]) >= s->range_table->length |
132 | || aref_invalid(s, chanlist[i])) { | 132 | || aref_invalid(s, chanlist[i])) { |
133 | printk | 133 | printk(KERN_ERR "bad chanlist[%d]=0x%08x " |
134 | ("bad chanlist[%d]=0x%08x n_chan=%d range length=%d\n", | 134 | "in_chan=%d range length=%d\n", i, |
135 | i, chanlist[i], s->n_chan, | 135 | chanlist[i], s->n_chan, |
136 | s->range_table->length); | 136 | s->range_table->length); |
137 | #if 0 | ||
138 | for (i = 0; i < n; i++) | ||
139 | printk("[%d]=0x%08x\n", i, chanlist[i]); | ||
140 | #endif | ||
141 | return -EINVAL; | 137 | return -EINVAL; |
142 | } | 138 | } |
143 | } else if (s->range_table_list) { | 139 | } else if (s->range_table_list) { |
@@ -147,13 +143,13 @@ int check_chanlist(struct comedi_subdevice *s, int n, unsigned int *chanlist) | |||
147 | CR_RANGE(chanlist[i]) >= | 143 | CR_RANGE(chanlist[i]) >= |
148 | s->range_table_list[chan]->length | 144 | s->range_table_list[chan]->length |
149 | || aref_invalid(s, chanlist[i])) { | 145 | || aref_invalid(s, chanlist[i])) { |
150 | printk("bad chanlist[%d]=0x%08x\n", i, | 146 | printk(KERN_ERR "bad chanlist[%d]=0x%08x\n", |
151 | chanlist[i]); | 147 | i, chanlist[i]); |
152 | return -EINVAL; | 148 | return -EINVAL; |
153 | } | 149 | } |
154 | } | 150 | } |
155 | } else { | 151 | } else { |
156 | printk("comedi: (bug) no range type list!\n"); | 152 | printk(KERN_ERR "comedi: (bug) no range type list!\n"); |
157 | return -EINVAL; | 153 | return -EINVAL; |
158 | } | 154 | } |
159 | return 0; | 155 | return 0; |