Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7448fcd3 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b88c5997

drivers/staging/comedi/drivers/ni_daq_700.c

+2 −5
Original line number Diff line number Diff line
@@ -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);