diff options
| author | H Hartley Sweeten | 2014-02-10 19:49:45 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2014-02-14 18:28:46 +0100 |
| commit | 22ca19d93d92c79cff68270846a84bd34fe6fb34 (patch) | |
| tree | 1ec371d914a7b965130d658d4232f6d34ef85cb0 /drivers/staging/comedi/comedi_fops.c | |
| parent | staging: comedi: dmm32at: use comedi_timeout() (diff) | |
| download | kernel-qcow2-linux-22ca19d93d92c79cff68270846a84bd34fe6fb34.tar.gz kernel-qcow2-linux-22ca19d93d92c79cff68270846a84bd34fe6fb34.tar.xz kernel-qcow2-linux-22ca19d93d92c79cff68270846a84bd34fe6fb34.zip | |
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/comedi_fops.c')
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index b36b76060d03..ac1edd9d1e21 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -1194,6 +1194,11 @@ static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn, switch (insn->insn) { case INSN_READ: 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; case INSN_WRITE: maxdata = s->maxdata_list @@ -1207,8 +1212,14 @@ static int parse_insn(struct comedi_device *dev, struct comedi_insn *insn, break; } } - if (ret == 0) + if (ret == 0) { 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; case INSN_BITS: if (insn->n != 2) { |