[PATCH 23/31] staging: comedi: ni_daq_700: remove local variable in the 'attach' function

H Hartley Sweeten hartleys at visionengravers.com
Fri Jun 22 23:33:10 UTC 2012


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 at visionengravers.com>
Cc: Ian Abbott <abbotti at mev.co.uk>
Cc: Frank Mori Hess <fmhess at users.sourceforge.net>
Cc: Greg Kroah-hartman <gregkh at linuxfoundation.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




More information about the devel mailing list