AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-25 06:41:21 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: pcl711: cleanup dev->board_name usage

Browse Source 
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:
H Hartley Sweeten 2013-04-09 16:06:31 -07:00 committed by Greg Kroah-Hartman
parent f375ac5f19
commit 814c219a3e
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/comedi/drivers/pcl711.c
View File

@ -459,16 +459,12 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
iobase = it->options[0]; iobase = it->options[0];
printk(KERN_INFO "comedi%d: pcl711: 0x%04lx ", dev->minor, iobase); printk(KERN_INFO "comedi%d: pcl711: 0x%04lx ", dev->minor, iobase);
if (!request_region(iobase, PCL711_SIZE, "pcl711")) { if (!request_region(iobase, PCL711_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;
/* there should be a sanity check here */
dev->board_name = board->name;
/* grab our IRQ */ /* grab our IRQ */
irq = it->options[1]; irq = it->options[1];
if (irq > board->maxirq) { if (irq > board->maxirq) {
@ -476,7 +472,8 @@ static int pcl711_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return -EINVAL; return -EINVAL;
} }
if (irq) { if (irq) {
if (request_irq(irq, pcl711_interrupt, 0, "pcl711", dev)) { if (request_irq(irq, pcl711_interrupt, 0, dev->board_name,
dev)) {
printk(KERN_ERR "unable to allocate irq %u\n", irq); printk(KERN_ERR "unable to allocate irq %u\n", irq);
return -EINVAL; return -EINVAL;
} else { } else {