diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-09 19:27:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-11 15:47:52 -0400 |
commit | 7b650090398c4e1508a1c4fd38bb744ecab584fa (patch) | |
tree | f9e50acce3a2b65988d2f6c0083b81583f0a2164 /drivers/staging | |
parent | 3e9b1fcaf9b2e156afc33c34cfd1d763d537ae79 (diff) |
staging: comedi: pcmda12: use comedi_request_region()
Use comedi_request_region() to request the I/O region used by this
driver.
Remove the noise when the board is first attached as well as the
error message when the request_region() fails, comedi_request_reqion()
will output the error message if necessary.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
-rw-r--r-- | drivers/staging/comedi/drivers/pcmda12.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/staging/comedi/drivers/pcmda12.c b/drivers/staging/comedi/drivers/pcmda12.c index 64b76e48c290..1e337b717a72 100644 --- a/drivers/staging/comedi/drivers/pcmda12.c +++ b/drivers/staging/comedi/drivers/pcmda12.c | |||
@@ -154,19 +154,11 @@ static int pcmda12_attach(struct comedi_device *dev, | |||
154 | { | 154 | { |
155 | struct pcmda12_private *devpriv; | 155 | struct pcmda12_private *devpriv; |
156 | struct comedi_subdevice *s; | 156 | struct comedi_subdevice *s; |
157 | unsigned long iobase; | ||
158 | int ret; | 157 | int ret; |
159 | 158 | ||
160 | iobase = it->options[0]; | 159 | ret = comedi_request_region(dev, it->options[0], IOSIZE); |
161 | printk(KERN_INFO | 160 | if (ret) |
162 | "comedi%d: %s: io: %lx %s ", dev->minor, dev->driver->driver_name, | 161 | return ret; |
163 | iobase, it->options[1] ? "simultaneous xfer mode enabled" : ""); | ||
164 | |||
165 | if (!request_region(iobase, IOSIZE, dev->driver->driver_name)) { | ||
166 | printk("I/O port conflict\n"); | ||
167 | return -EIO; | ||
168 | } | ||
169 | dev->iobase = iobase; | ||
170 | 162 | ||
171 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); | 163 | devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL); |
172 | if (!devpriv) | 164 | if (!devpriv) |
@@ -191,8 +183,6 @@ static int pcmda12_attach(struct comedi_device *dev, | |||
191 | 183 | ||
192 | zero_chans(dev); /* clear out all the registers, basically */ | 184 | zero_chans(dev); /* clear out all the registers, basically */ |
193 | 185 | ||
194 | printk(KERN_INFO "attached\n"); | ||
195 | |||
196 | return 1; | 186 | return 1; |
197 | } | 187 | } |
198 | 188 | ||