staging: comedi: ni_daq_700: remove local variable in the 'attach' function
authorH Hartley Sweeten <hartleys@visionengravers.com>
Fri, 22 Jun 2012 23:33:10 +0000 (16:33 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Jun 2012 03:55:08 +0000 (20:55 -0700)
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>
drivers/staging/comedi/drivers/ni_daq_700.c

index 50fad12f7eb18d3450a57b41439da1cc76b36534..5c60df832467a92dcc17d92549656c7b6a6f8add 100644 (file)
@@ -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);