aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorBenjamin Adolphi <b.adolphi@googlemail.com>2010-01-31 18:04:14 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-03 19:42:54 -0500
commit7df1735bebee6d1f3492c79ab110f3a6e67e0244 (patch)
tree6f7be2c4fe222ed08d83b30fbd63ea315e51cebd /drivers/staging
parent27aa7320972a130ba3cd2d4004c2568e7c40f01e (diff)
Staging: comedi: adq12b: Checkpatch cleanups 2
This fixes all checkpatch issues in the adq12b comedi driver. Signed-off-by: Benjamin Adolphi <b.adolphi@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/comedi/drivers/adq12b.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/adq12b.c b/drivers/staging/comedi/drivers/adq12b.c
index 4590cac612d..f3ba645bf63 100644
--- a/drivers/staging/comedi/drivers/adq12b.c
+++ b/drivers/staging/comedi/drivers/adq12b.c
@@ -201,15 +201,16 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
201 unipolar = it->options[1]; 201 unipolar = it->options[1];
202 differential = it->options[2]; 202 differential = it->options[2];
203 203
204 printk("comedi%d: adq12b called with options base=0x%03lx, %s and %s\n", 204 printk(KERN_INFO "comedi%d: adq12b called with options base=0x%03lx, "
205 dev->minor, iobase, (unipolar == 1) ? "unipolar" : "bipolar", 205 "%s and %s\n", dev->minor, iobase,
206 (unipolar == 1) ? "unipolar" : "bipolar",
206 (differential == 1) ? "differential" : "single-ended"); 207 (differential == 1) ? "differential" : "single-ended");
207 208
208 /* if no address was specified, try the default 0x300 */ 209 /* if no address was specified, try the default 0x300 */
209 if (iobase == 0) { 210 if (iobase == 0) {
210 printk 211 printk(KERN_WARNING "comedi%d: adq12b warning: I/O base "
211 ("comedi%d: adq12b warning: I/O base address not specified. Trying the default 0x300.\n", 212 "address not specified. Trying the default 0x300.\n",
212 dev->minor); 213 dev->minor);
213 iobase = 0x300; 214 iobase = 0x300;
214 } 215 }
215 216
@@ -289,7 +290,7 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
289 s->range_table = &range_digital; 290 s->range_table = &range_digital;
290 s->insn_bits = adq12b_do_insn_bits; 291 s->insn_bits = adq12b_do_insn_bits;
291 292
292 printk("attached\n"); 293 printk(KERN_INFO "attached\n");
293 294
294 return 0; 295 return 0;
295} 296}
@@ -309,7 +310,7 @@ static int adq12b_detach(struct comedi_device *dev)
309 310
310 kfree(devpriv); 311 kfree(devpriv);
311 312
312 printk("comedi%d: adq12b: removed\n", dev->minor); 313 printk(KERN_INFO "comedi%d: adq12b: removed\n", dev->minor);
313 314
314 return 0; 315 return 0;
315} 316}
@@ -354,7 +355,8 @@ static int adq12b_ai_rinsn(struct comedi_device *dev,
354 hi = inb(dev->iobase + ADQ12B_ADHIG); 355 hi = inb(dev->iobase + ADQ12B_ADHIG);
355 lo = inb(dev->iobase + ADQ12B_ADLOW); 356 lo = inb(dev->iobase + ADQ12B_ADLOW);
356 357
357 /* printk("debug: chan=%d range=%d status=%d hi=%d lo=%d\n", channel, range, status, hi, lo); */ 358 /* printk("debug: chan=%d range=%d status=%d hi=%d lo=%d\n",
359 channel, range, status, hi, lo); */
358 data[n] = (hi << 8) | lo; 360 data[n] = (hi << 8) | lo;
359 361
360 } 362 }