[<prev] [next>] [day] [month] [year] [list]
Message-ID: <201206221633.11268.hartleys@visionengravers.com>
Date: Fri, 22 Jun 2012 16:33:10 -0700
From: H Hartley Sweeten <hartleys@...ionengravers.com>
To: Linux Kernel <linux-kernel@...r.kernel.org>
CC: <devel@...verdev.osuosl.org>, <abbotti@....co.uk>,
<fmhess@...rs.sourceforge.net>, <gregkh@...uxfoundation.org>
Subject: [PATCH 23/31] 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@...ionengravers.com>
Cc: Ian Abbott <abbotti@....co.uk>
Cc: Frank Mori Hess <fmhess@...rs.sourceforge.net>
Cc: Greg Kroah-hartman <gregkh@...uxfoundation.org>
---
drivers/staging/comedi/drivers/ni_daq_700.c | 7 ++-----
1 file 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 50fad12..5c60df8 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);
--
1.7.11
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists