FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-24 06:24:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: comedi_parport: cleanup dev->board_name

Browse Source 
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2012-08-20 14:30:27 -07:00 committed by Greg Kroah-Hartman
parent d3bcf099de
commit 45d637000d
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/comedi/drivers/comedi_parport.c
View File

@ -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)