staging: comedi: ni_atmio16d: cleanup dev->board_name usage
This legacy driver does no additional probing so the dev->board_name will already be properly initialized by the comedi core before calling the (*attach) function. Remove the unnecessary initialization of dev->board_name and use it when requesting the resources instead of the open-coded strings. 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
b1bc927604
commit
61f9eb9a01
1 changed files with 1 additions and 3 deletions
|
@ -647,14 +647,12 @@ static int atmio16d_attach(struct comedi_device *dev,
|
||||||
/* make sure the address range is free and allocate it */
|
/* make sure the address range is free and allocate it */
|
||||||
iobase = it->options[0];
|
iobase = it->options[0];
|
||||||
printk(KERN_INFO "comedi%d: atmio16d: 0x%04lx ", dev->minor, iobase);
|
printk(KERN_INFO "comedi%d: atmio16d: 0x%04lx ", dev->minor, iobase);
|
||||||
if (!request_region(iobase, ATMIO16D_SIZE, "ni_atmio16d")) {
|
if (!request_region(iobase, ATMIO16D_SIZE, dev->board_name)) {
|
||||||
printk("I/O port conflict\n");
|
printk("I/O port conflict\n");
|
||||||
return -EIO;
|
return -EIO;
|
||||||
}
|
}
|
||||||
dev->iobase = iobase;
|
dev->iobase = iobase;
|
||||||
|
|
||||||
dev->board_name = board->name;
|
|
||||||
|
|
||||||
ret = comedi_alloc_subdevices(dev, 4);
|
ret = comedi_alloc_subdevices(dev, 4);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Add table
Reference in a new issue