diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-04-08 18:15:46 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-04-09 16:29:03 -0700 |
| commit | 7b2234df5e2ec3fbb206fc4442099faf5859a177 (patch) | |
| tree | db9d582cfc1a8d9f3c9e3629c7f14d2ccd8126fa /drivers/staging/comedi/drivers/rti800.c | |
| parent | 62d4d5613d8b4c35555ef338ac27c3df1e36e4b4 (diff) | |
staging: comedi: rti800: cleanup dev->board_name usage
The comedi core initializes the dev->board_name before calling the
driver (*attach) function. There is not reason to reinitialize it
in the driver.
Use the dev->board_name when doing the request_{region,irq}() instead
of the open-coded string.
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>
Diffstat (limited to 'drivers/staging/comedi/drivers/rti800.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/rti800.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/comedi/drivers/rti800.c b/drivers/staging/comedi/drivers/rti800.c index fdfbf412cc73..eac727e2dae2 100644 --- a/drivers/staging/comedi/drivers/rti800.c +++ b/drivers/staging/comedi/drivers/rti800.c @@ -309,7 +309,7 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) struct comedi_subdevice *s; iobase = it->options[0]; - if (!request_region(iobase, RTI800_SIZE, "rti800")) + if (!request_region(iobase, RTI800_SIZE, dev->board_name)) return -EIO; dev->iobase = iobase; @@ -319,14 +319,13 @@ static int rti800_attach(struct comedi_device *dev, struct comedi_devconfig *it) irq = it->options[1]; if (irq) { - ret = request_irq(irq, rti800_interrupt, 0, "rti800", dev); + ret = request_irq(irq, rti800_interrupt, 0, dev->board_name, + dev); if (ret < 0) return ret; dev->irq = irq; } - dev->board_name = board->name; - ret = comedi_alloc_subdevices(dev, 4); if (ret) return ret; |