diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-06-22 16:33:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-22 20:55:08 -0700 |
| commit | 7448fcd3b8caee05c6e5a7dc965b5845affbb2e8 (patch) | |
| tree | 201e6499decdd5a9fb208eb8fd62b0ca76391fc9 /drivers | |
| parent | b88c59972db3117996913d8e74fdfe9df3ac601b (diff) | |
| download | linux-7448fcd3b8caee05c6e5a7dc965b5845affbb2e8.tar.bz2 | |
staging: comedi: ni_daq_700: remove local variable in the 'attach' function
There is no need for the local variable 'iobase' in the attach
function. If it's '0' the attach fails otherwise the value is
just stored in dev->iobase.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index 50fad12f7eb1..5c60df832467 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -104,22 +104,19 @@ static int dio700_attach(struct comedi_device *dev, struct comedi_devconfig *it) { const struct dio700_board *thisboard = comedi_board(dev); struct comedi_subdevice *s; - unsigned long iobase = 0; struct pcmcia_device *link; int ret; link = pcmcia_cur_dev; /* XXX hack */ if (!link) return -EIO; - iobase = link->resource[0]->start; - if (iobase == 0) { + dev->iobase = link->resource[0]->start; + if (!dev->iobase) { dev_err(dev->class_dev, "io base address is zero!\n"); return -EINVAL; } - dev->iobase = iobase; - dev->board_name = thisboard->name; ret = comedi_alloc_subdevices(dev, 1); |