diff options
author | Benjamin Adolphi <b.adolphi@googlemail.com> | 2010-01-28 18:28:46 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-03 19:42:54 -0500 |
commit | 94941bc805d2b77e6b548b83529b3fa5e98a3636 (patch) | |
tree | 76fe8ee33cc22e93d1fcdeb58cf16b5d05164f65 /drivers | |
parent | b1e68ea5e1b0829037a1dc97e8a2ef4bb6e9c91d (diff) |
Staging: comedi: poc: Checkpatch cleanups
This fixes all checkpatch issues in the poc comedi driver.
Signed-off-by: Benjamin Adolphi <b.adolphi@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/comedi/drivers/poc.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/poc.c b/drivers/staging/comedi/drivers/poc.c index d23e588d0632..8990bf2fc186 100644 --- a/drivers/staging/comedi/drivers/poc.c +++ b/drivers/staging/comedi/drivers/poc.c | |||
@@ -122,22 +122,21 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
122 | unsigned int iosize; | 122 | unsigned int iosize; |
123 | 123 | ||
124 | iobase = it->options[0]; | 124 | iobase = it->options[0]; |
125 | printk("comedi%d: poc: using %s iobase 0x%lx\n", dev->minor, | 125 | printk(KERN_INFO "comedi%d: poc: using %s iobase 0x%lx\n", dev->minor, |
126 | this_board->name, iobase); | 126 | this_board->name, iobase); |
127 | 127 | ||
128 | dev->board_name = this_board->name; | 128 | dev->board_name = this_board->name; |
129 | 129 | ||
130 | if (iobase == 0) { | 130 | if (iobase == 0) { |
131 | printk("io base address required\n"); | 131 | printk(KERN_WARNING "io base address required\n"); |
132 | return -EINVAL; | 132 | return -EINVAL; |
133 | } | 133 | } |
134 | 134 | ||
135 | iosize = this_board->iosize; | 135 | iosize = this_board->iosize; |
136 | /* check if io addresses are available */ | 136 | /* check if io addresses are available */ |
137 | if (!request_region(iobase, iosize, "dac02")) { | 137 | if (!request_region(iobase, iosize, "dac02")) { |
138 | printk | 138 | printk(KERN_WARNING "I/O port conflict: failed to allocate " |
139 | ("I/O port conflict: failed to allocate ports 0x%lx to 0x%lx\n", | 139 | "ports 0x%lx to 0x%lx\n", iobase, iobase + iosize - 1); |
140 | iobase, iobase + iosize - 1); | ||
141 | return -EIO; | 140 | return -EIO; |
142 | } | 141 | } |
143 | dev->iobase = iobase; | 142 | dev->iobase = iobase; |
@@ -156,9 +155,8 @@ static int poc_attach(struct comedi_device *dev, struct comedi_devconfig *it) | |||
156 | s->insn_write = this_board->winsn; | 155 | s->insn_write = this_board->winsn; |
157 | s->insn_read = this_board->rinsn; | 156 | s->insn_read = this_board->rinsn; |
158 | s->insn_bits = this_board->insnbits; | 157 | s->insn_bits = this_board->insnbits; |
159 | if (s->type == COMEDI_SUBD_AO || s->type == COMEDI_SUBD_DO) { | 158 | if (s->type == COMEDI_SUBD_AO || s->type == COMEDI_SUBD_DO) |
160 | s->subdev_flags = SDF_WRITABLE; | 159 | s->subdev_flags = SDF_WRITABLE; |
161 | } | ||
162 | 160 | ||
163 | return 0; | 161 | return 0; |
164 | } | 162 | } |
@@ -169,7 +167,7 @@ static int poc_detach(struct comedi_device *dev) | |||
169 | if (dev->iobase) | 167 | if (dev->iobase) |
170 | release_region(dev->iobase, this_board->iosize); | 168 | release_region(dev->iobase, this_board->iosize); |
171 | 169 | ||
172 | printk("comedi%d: dac02: remove\n", dev->minor); | 170 | printk(KERN_INFO "comedi%d: dac02: remove\n", dev->minor); |
173 | 171 | ||
174 | return 0; | 172 | return 0; |
175 | } | 173 | } |