hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
H Hartley Sweeten 2012-06-22 16:33:10 -07:00 committed by Greg Kroah-Hartman
parent b88c59972d
commit 7448fcd3b8
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/staging/comedi/drivers/ni_daq_700.c
View 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); const struct dio700_board *thisboard = comedi_board(dev);
struct comedi_subdevice *s; struct comedi_subdevice *s;
unsigned long iobase = 0;
struct pcmcia_device *link; struct pcmcia_device *link;
int ret; int ret;
link = pcmcia_cur_dev; /* XXX hack */ link = pcmcia_cur_dev; /* XXX hack */
if (!link) if (!link)
return -EIO; 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"); dev_err(dev->class_dev, "io base address is zero!\n");
return -EINVAL; return -EINVAL;
} }
dev->iobase = iobase;
dev->board_name = thisboard->name; dev->board_name = thisboard->name;
ret = comedi_alloc_subdevices(dev, 1); ret = comedi_alloc_subdevices(dev, 1);