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

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

staging: comedi: move (*insn_{read, write}) timeout debug messages to core 



Have the comedi core display a standard dev_dbg() message when a timeout
occurs and remove all the driver specific messages.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f7b3d79a

drivers/staging/comedi/comedi_fops.c

+12 −1
Original line number Original line Diff line number Diff line
@@ -1194,6 +1194,11 @@ static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn, 
		switch (insn->insn) {

		switch (insn->insn) {

		case INSN_READ:

		case INSN_READ:

			ret = s->insn_read(dev, s, insn, data);

			ret = s->insn_read(dev, s, insn, data);

			if (ret == -ETIMEDOUT) {

				dev_dbg(dev->class_dev,

					"subdevice %d read instruction timed out\n",

					s->index);

			}

			break;

			break;

		case INSN_WRITE:

		case INSN_WRITE:

			maxdata = s->maxdata_list

			maxdata = s->maxdata_list
@@ -1207,8 +1212,14 @@ static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn, 
					break;

					break;

				}

				}

			}

			}

			if (ret == 0)

			if (ret == 0) {

				ret = s->insn_write(dev, s, insn, data);

				ret = s->insn_write(dev, s, insn, data);

				if (ret == -ETIMEDOUT) {

					dev_dbg(dev->class_dev,

						"subdevice %d write instruction timed out\n",

						s->index);

				}

			}

			break;

			break;

		case INSN_BITS:

		case INSN_BITS:

			if (insn->n != 2) {

			if (insn->n != 2) {

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) {

			comedi_error(dev, "A/D read timeout");

			data[i] = 0;

			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) {

			comedi_error(dev, "A/D insn timeout");

			data[n] = 0;

			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
@@ -467,7 +467,6 @@ static int pci171x_insn_read_ai(struct comedi_device *dev, 




		ret = comedi_timeout(dev, s, insn, pci171x_ai_eoc, 0);

		ret = comedi_timeout(dev, s, insn, pci171x_ai_eoc, 0);

		if (ret) {

		if (ret) {

			comedi_error(dev, "A/D insn timeout");

			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;

			data[n] = 0;

drivers/staging/comedi/drivers/aio_aio12_8.c

+1 −3
Original line number Original line Diff line number Diff line
@@ -140,10 +140,8 @@ static int aio_aio12_8_ai_read(struct comedi_device *dev, 




		/*  Wait for conversion to complete */

		/*  Wait for conversion to complete */

		ret = comedi_timeout(dev, s, insn, aio_aio12_8_ai_eoc, 0);

		ret = comedi_timeout(dev, s, insn, aio_aio12_8_ai_eoc, 0);

		if (ret) {

		if (ret)

			dev_err(dev->class_dev, "ADC timeout\n");

			return ret;

			return ret;

		}





		data[n] = inw(dev->iobase + AIO12_8_ADC_REG) & s->maxdata;

		data[n] = inw(dev->iobase + AIO12_8_ADC_REG) & s->maxdata;

	}

	}