diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-09 16:11:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-11 12:47:37 -0700 |
| commit | b27cc4135cd54064ccee8b4aeccfc659e19447a6 (patch) | |
| tree | c68c2e0bfb6b06bca26f4ba0fb94990c6bbaef8a | |
| parent | 22b580f07ec7cf8452496d7ad80b29ca22e1c541 (diff) | |
staging: comedi: pcl818: 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>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl818.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index b5af22eb7c37..e4df63e2e3f9 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c @@ -1616,7 +1616,7 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it) devpriv->io_range = PCLx1xFIFO_RANGE; devpriv->usefifo = 1; } - if (!request_region(iobase, devpriv->io_range, "pcl818")) { + if (!request_region(iobase, devpriv->io_range, dev->board_name)) { comedi_error(dev, "I/O port conflict\n"); return -EIO; } @@ -1628,8 +1628,6 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it) return -EIO; } - dev->board_name = board->name; - /* grab our IRQ */ irq = 0; if (board->IRQbits != 0) { /* board support IRQ */ @@ -1641,8 +1639,8 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it) irq); irq = 0; /* Bad IRQ */ } else { - if (request_irq - (irq, interrupt_pcl818, 0, "pcl818", dev)) { + if (request_irq(irq, interrupt_pcl818, 0, + dev->board_name, dev)) { printk (", unable to allocate IRQ %u, DISABLING IT", irq); @@ -1707,7 +1705,7 @@ no_rtc: printk(KERN_ERR "DMA is out of allowed range, FAIL!\n"); return -EINVAL; /* Bad DMA */ } - ret = request_dma(dma, "pcl818"); + ret = request_dma(dma, dev->board_name); if (ret) return -EBUSY; /* DMA isn't free */ devpriv->dma = dma; |