Commit 45d63700 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

staging: comedi: comedi_parport: cleanup dev->board_name

Use the 'dev->driver->driver_name' for the 'dev->board_name'. And use
the 'dev->board_name' for the resource name passed to request_region
and request_irq.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d3bcf099
......@@ -302,9 +302,11 @@ static int parport_attach(struct comedi_device *dev,
unsigned long iobase;
struct comedi_subdevice *s;
dev->board_name = dev->driver->driver_name;
iobase = it->options[0];
printk(KERN_INFO "comedi%d: parport: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, PARPORT_SIZE, "parport (comedi)")) {
if (!request_region(iobase, PARPORT_SIZE, dev->board_name)) {
printk(KERN_ERR "I/O port conflict\n");
return -EIO;
}
......@@ -313,7 +315,7 @@ static int parport_attach(struct comedi_device *dev,
irq = it->options[1];
if (irq) {
printk(KERN_INFO " irq=%u", irq);
ret = request_irq(irq, parport_interrupt, 0, "comedi_parport",
ret = request_irq(irq, parport_interrupt, 0, dev->board_name,
dev);
if (ret < 0) {
printk(KERN_ERR " irq not available\n");
......@@ -321,7 +323,6 @@ static int parport_attach(struct comedi_device *dev,
}
dev->irq = irq;
}
dev->board_name = "parport";
ret = comedi_alloc_subdevices(dev, 4);
if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment