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/icp_multi.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/icp_multi.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/icp_multi.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/icp_multi.c b/drivers/staging/comedi/drivers/icp_multi.c index 7fb6ca0a2f26..ee30f2b8a54b 100644 --- a/drivers/staging/comedi/drivers/icp_multi.c +++ b/drivers/staging/comedi/drivers/icp_multi.c @@ -216,7 +216,6 @@ static int icp_multi_insn_read_ai(struct comedi_device *dev, /* Wait for conversion to complete, or get fed up waiting */ ret = comedi_timeout(dev, s, insn, icp_multi_ai_eoc, 0); if (ret) { - comedi_error(dev, "A/D insn timeout"); /* Clear data received */ data[n] = 0; break; @@ -287,8 +286,6 @@ static int icp_multi_insn_write_ao(struct comedi_device *dev, * ready for new data, or get fed up waiting */ ret = comedi_timeout(dev, s, insn, icp_multi_ao_eoc, 0); if (ret) { - comedi_error(dev, "D/A insn timeout"); - /* Disable interrupt */ devpriv->IntEnable &= ~DAC_READY; writew(devpriv->IntEnable, |