aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/comedi
diff options
context:
space:
mode:
authorBenjamin Adolphi <b.adolphi@googlemail.com>2010-02-06 14:06:50 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-04 10:59:00 -0500
commitdedf3ad1534ff5e30a2eba88afe64bbe7beecfb6 (patch)
tree5894639489769c0a95baa4578448f2d80a81b4d6 /drivers/staging/comedi
parent52d83bde6f10480268c454b3373bfcec8c2e3c3e (diff)
Staging: comedi: pcmad: Checkpatch cleanups
This fixes all checkpatch issues in the pcmad 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/comedi')
-rw-r--r--drivers/staging/comedi/drivers/pcmad.c19
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/staging/comedi/drivers/pcmad.c b/drivers/staging/comedi/drivers/pcmad.c
index acac6709081..f7991a9e0a7 100644
--- a/drivers/staging/comedi/drivers/pcmad.c
+++ b/drivers/staging/comedi/drivers/pcmad.c
@@ -34,11 +34,11 @@ Configuration options:
34 [0] - I/O port base 34 [0] - I/O port base
35 [1] - unused 35 [1] - unused
36 [2] - Analog input reference 36 [2] - Analog input reference
37 0 = single ended 37 0 = single ended
38 1 = differential 38 1 = differential
39 [3] - Analog input encoding (must match jumpers) 39 [3] - Analog input encoding (must match jumpers)
40 0 = straight binary 40 0 = straight binary
41 1 = two's complement 41 1 = two's complement
42*/ 42*/
43 43
44#include <linux/interrupt.h> 44#include <linux/interrupt.h>
@@ -113,9 +113,8 @@ static int pcmad_ai_insn_read(struct comedi_device *dev,
113 data[n] = inb(dev->iobase + PCMAD_LSB); 113 data[n] = inb(dev->iobase + PCMAD_LSB);
114 data[n] |= (inb(dev->iobase + PCMAD_MSB) << 8); 114 data[n] |= (inb(dev->iobase + PCMAD_MSB) << 8);
115 115
116 if (devpriv->twos_comp) { 116 if (devpriv->twos_comp)
117 data[n] ^= (1 << (this_board->n_ai_bits - 1)); 117 data[n] ^= (1 << (this_board->n_ai_bits - 1));
118 }
119 } 118 }
120 119
121 return n; 120 return n;
@@ -135,7 +134,7 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
135 unsigned long iobase; 134 unsigned long iobase;
136 135
137 iobase = it->options[0]; 136 iobase = it->options[0];
138 printk("comedi%d: pcmad: 0x%04lx ", dev->minor, iobase); 137 printk(KERN_INFO "comedi%d: pcmad: 0x%04lx ", dev->minor, iobase);
139 if (!request_region(iobase, PCMAD_SIZE, "pcmad")) { 138 if (!request_region(iobase, PCMAD_SIZE, "pcmad")) {
140 printk("I/O port conflict\n"); 139 printk("I/O port conflict\n");
141 return -EIO; 140 return -EIO;
@@ -166,11 +165,11 @@ static int pcmad_attach(struct comedi_device *dev, struct comedi_devconfig *it)
166 165
167static int pcmad_detach(struct comedi_device *dev) 166static int pcmad_detach(struct comedi_device *dev)
168{ 167{
169 printk("comedi%d: pcmad: remove\n", dev->minor); 168 printk(KERN_INFO "comedi%d: pcmad: remove\n", dev->minor);
170 169
171 if (dev->irq) { 170 if (dev->irq)
172 free_irq(dev->irq, dev); 171 free_irq(dev->irq, dev);
173 } 172
174 if (dev->iobase) 173 if (dev->iobase)
175 release_region(dev->iobase, PCMAD_SIZE); 174 release_region(dev->iobase, PCMAD_SIZE);
176 175