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

This project is archived. Its data is read-only.

Commit dbd446fc authored Feb 10, 2014 by H Hartley Sweeten Committed by Greg Kroah-Hartman Feb 14, 2014

staging: comedi: don't clear 'data' on (*insn_read) timeout



It's not necessary to clear the returned data pointer when an (*insn_read)
times out. For aesthetics, remove all of these in the drivers.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 22ca19d9

drivers/staging/comedi/drivers/adl_pci9111.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -748,7 +748,6 @@ static int pci9111_ai_insn_read(struct comedi_device *dev,

	ret = comedi_timeout(dev, s, insn, pci9111_ai_eoc, 0);		ret = comedi_timeout(dev, s, insn, pci9111_ai_eoc, 0);
	if (ret) {		if (ret) {
	data[i] = 0;
	pci9111_fifo_reset(dev);		pci9111_fifo_reset(dev);
	return ret;		return ret;
	}		}

drivers/staging/comedi/drivers/adl_pci9118.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -614,7 +614,6 @@ static int pci9118_insn_read_ai(struct comedi_device *dev,

	ret = comedi_timeout(dev, s, insn, pci9118_ai_eoc, 0);		ret = comedi_timeout(dev, s, insn, pci9118_ai_eoc, 0);
	if (ret) {		if (ret) {
	data[n] = 0;
	outl(0, dev->iobase + PCI9118_DELFIFO); /* flush FIFO */		outl(0, dev->iobase + PCI9118_DELFIFO); /* flush FIFO */
	return ret;		return ret;
	}		}

drivers/staging/comedi/drivers/adv_pci1710.c

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -469,7 +469,6 @@ static int pci171x_insn_read_ai(struct comedi_device *dev,
	if (ret) {		if (ret) {
	outb(0, dev->iobase + PCI171x_CLRFIFO);		outb(0, dev->iobase + PCI171x_CLRFIFO);
	outb(0, dev->iobase + PCI171x_CLRINT);		outb(0, dev->iobase + PCI171x_CLRINT);
	data[n] = 0;
	return ret;		return ret;
	}		}

drivers/staging/comedi/drivers/dyna_pci10xx.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -93,10 +93,8 @@ static int dyna_pci10xx_insn_read_ai(struct comedi_device *dev,
	udelay(10);		udelay(10);

	ret = comedi_timeout(dev, s, insn, dyna_pci10xx_ai_eoc, 0);		ret = comedi_timeout(dev, s, insn, dyna_pci10xx_ai_eoc, 0);
	if (ret) {		if (ret)
	data[n] = 0;
	break;		break;
	}

	/* read data */		/* read data */
	d = inw_p(dev->iobase);		d = inw_p(dev->iobase);

drivers/staging/comedi/drivers/icp_multi.c

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -215,11 +215,8 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev,

	/* Wait for conversion to complete, or get fed up waiting */		/* Wait for conversion to complete, or get fed up waiting */
	ret = comedi_timeout(dev, s, insn, icp_multi_ai_eoc, 0);		ret = comedi_timeout(dev, s, insn, icp_multi_ai_eoc, 0);
	if (ret) {		if (ret)
	/* Clear data received */
	data[n] = 0;
	break;		break;
	}

	data[n] =		data[n] =
	(readw(devpriv->io_addr + ICP_MULTI_AI) >> 4) & 0x0fff;		(readw(devpriv->io_addr + ICP_MULTI_AI) >> 4) & 0x0fff;