summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Abbott2015-10-27 17:59:24 +0100
committerGreg Kroah-Hartman2015-10-29 00:58:36 +0100
commit9406a3140a76772cc6bbf8704ecebbd249e9ca9b (patch)
tree21a96101ee9dd7292b4f6fa43be0268117827c7c
parentstaging: comedi: comedi_test: handle partial scans in timer routine (diff)
downloadkernel-qcow2-linux-9406a3140a76772cc6bbf8704ecebbd249e9ca9b.tar.gz
kernel-qcow2-linux-9406a3140a76772cc6bbf8704ecebbd249e9ca9b.tar.xz
kernel-qcow2-linux-9406a3140a76772cc6bbf8704ecebbd249e9ca9b.zip
staging: comedi: comedi_test: rename waveform_ai_interrupt()
`waveform_ai_interrupt()` is a timer expiry function used to generate fake waveform data for an analog input subdevice. Rename it to `waveform_ai_timer()`. Signed-off-by: Ian Abbott <abbotti@mev.co.uk> Reviewed-by: H Hartley Sweeten <hsweeten@visionengravers.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/comedi/drivers/comedi_test.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c
index 318340c6f247..14a0b6247922 100644
--- a/drivers/staging/comedi/drivers/comedi_test.c
+++ b/drivers/staging/comedi/drivers/comedi_test.c
@@ -176,7 +176,7 @@ static unsigned short fake_waveform(struct comedi_device *dev,
* It should run in the background; therefore it is scheduled by
* a timer mechanism.
*/
-static void waveform_ai_interrupt(unsigned long arg)
+static void waveform_ai_timer(unsigned long arg)
{
struct comedi_device *dev = (struct comedi_device *)arg;
struct waveform_private *devpriv = dev->private;
@@ -486,8 +486,7 @@ static int waveform_attach(struct comedi_device *dev,
for (i = 0; i < s->n_chan; i++)
devpriv->ao_loopbacks[i] = s->maxdata / 2;
- setup_timer(&devpriv->ai_timer, waveform_ai_interrupt,
- (unsigned long)dev);
+ setup_timer(&devpriv->ai_timer, waveform_ai_timer, (unsigned long)dev);
dev_info(dev->class_dev,
"%s: %u microvolt, %u microsecond waveform attached\n",