Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1256978

[PATCH 15/16] staging: comedi: comedi_test: rename waveform_ai_interrupt()

Show all headers | View raw

`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>
---
 drivers/staging/comedi/drivers/comedi_test.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/comedi/drivers/comedi_test.c b/drivers/staging/comedi/drivers/comedi_test.c
index 318340c..14a0b62 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",
-- 
2.6.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 00/16] staging: comedi: comedi_test: enhancements Ian Abbott <abbotti@mev.co.uk> - 2015-10-27 18:10 +0100
  [PATCH 11/16] staging: comedi: comedi_test: make timer rate similar to scan rate Ian Abbott <abbotti@mev.co.uk> - 2015-10-27 18:10 +0100
  [PATCH 08/16] staging: comedi: comedi_test: simplify time since last AI scan Ian Abbott <abbotti@mev.co.uk> - 2015-10-27 18:10 +0100
  [PATCH 05/16] staging: comedi: comedi_test: support scan_begin_src == TRIG_FOLLOW Ian Abbott <abbotti@mev.co.uk> - 2015-10-27 18:10 +0100
  [PATCH 15/16] staging: comedi: comedi_test: rename waveform_ai_interrupt() Ian Abbott <abbotti@mev.co.uk> - 2015-10-27 18:10 +0100
  [PATCH 06/16] staging: comedi: comedi_test: move modulo operations for waveform Ian Abbott <abbotti@mev.co.uk> - 2015-10-27 18:10 +0100
  [PATCH 14/16] staging: comedi: comedi_test: handle partial scans in timer routine Ian Abbott <abbotti@mev.co.uk> - 2015-10-27 18:10 +0100
  [PATCH 09/16] staging: comedi: comedi_test: rename members for AI commands Ian Abbott <abbotti@mev.co.uk> - 2015-10-27 18:10 +0100
  RE: [PATCH 00/16] staging: comedi: comedi_test: enhancements Hartley Sweeten <HartleyS@visionengravers.com> - 2015-10-29 00:20 +0100

csiph-web