mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-20 00:46:46 +07:00
staging: comedi: adq12b: 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>
This commit is contained in:
parent
54573376e8
commit
b8c5d2ca05
@ -213,33 +213,15 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
||||
{
|
||||
struct adq12b_private *devpriv;
|
||||
struct comedi_subdevice *s;
|
||||
unsigned long iobase;
|
||||
int unipolar, differential;
|
||||
int ret;
|
||||
|
||||
iobase = it->options[0];
|
||||
unipolar = it->options[1];
|
||||
differential = it->options[2];
|
||||
|
||||
printk(KERN_INFO "comedi%d: adq12b called with options base=0x%03lx, "
|
||||
"%s and %s\n", dev->minor, iobase,
|
||||
(unipolar == 1) ? "unipolar" : "bipolar",
|
||||
(differential == 1) ? "differential" : "single-ended");
|
||||
|
||||
/* if no address was specified, try the default 0x300 */
|
||||
if (iobase == 0) {
|
||||
printk(KERN_WARNING "comedi%d: adq12b warning: I/O base "
|
||||
"address not specified. Trying the default 0x300.\n",
|
||||
dev->minor);
|
||||
iobase = 0x300;
|
||||
}
|
||||
|
||||
printk("comedi%d: adq12b: 0x%04lx ", dev->minor, iobase);
|
||||
if (!request_region(iobase, ADQ12B_SIZE, "adq12b")) {
|
||||
printk("I/O port conflict\n");
|
||||
return -EIO;
|
||||
}
|
||||
dev->iobase = iobase;
|
||||
ret = comedi_request_region(dev, it->options[0], ADQ12B_SIZE);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
devpriv = kzalloc(sizeof(*devpriv), GFP_KERNEL);
|
||||
if (!devpriv)
|
||||
@ -300,8 +282,6 @@ static int adq12b_attach(struct comedi_device *dev, struct comedi_devconfig *it)
|
||||
s->range_table = &range_digital;
|
||||
s->insn_bits = adq12b_do_insn_bits;
|
||||
|
||||
printk(KERN_INFO "attached\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user