diff options
author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-02-10 11:49:45 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-14 09:28:46 -0800 |
commit | 22ca19d93d92c79cff68270846a84bd34fe6fb34 (patch) | |
tree | 1ec371d914a7b965130d658d4232f6d34ef85cb0 /drivers/staging/comedi/drivers/ni_daq_700.c | |
parent | f7b3d79a622c97483c8d0e6e4bbd5207929259d9 (diff) |
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: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/comedi/drivers/ni_daq_700.c')
-rw-r--r-- | drivers/staging/comedi/drivers/ni_daq_700.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/staging/comedi/drivers/ni_daq_700.c b/drivers/staging/comedi/drivers/ni_daq_700.c index e56bfeb89a81..171a71d20c88 100644 --- a/drivers/staging/comedi/drivers/ni_daq_700.c +++ b/drivers/staging/comedi/drivers/ni_daq_700.c @@ -150,22 +150,8 @@ static int daq700_ai_rinsn(struct comedi_device *dev, /* wait for conversion to end */ ret = comedi_timeout(dev, s, insn, daq700_ai_eoc, 0); - if (ret) { - switch (ret) { - case -EOVERFLOW: - dev_info(dev->class_dev, - "Overflow/run Error\n"); - break; - case -ENODATA: - dev_info(dev->class_dev, "Data Error\n"); - break; - default: - dev_info(dev->class_dev, - "timeout during ADC conversion\n"); - break; - } + if (ret) return ret; - } /* read data */ d = inw(dev->iobase + ADFIFO_R); |