]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: amplc_pci230: change pci230_handle_ao_fifo() return type
authorIan Abbott <abbotti@mev.co.uk>
Mon, 1 Sep 2014 11:03:59 +0000 (12:03 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Sep 2014 18:21:32 +0000 (11:21 -0700)
Change the return type of `pci230_handle_ao_fifo()` from `int` to
`bool`.  A return value of `true` indicates the AO command is still
running.

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>
drivers/staging/comedi/drivers/amplc_pci230.c

index 27ff5bec8bc73f306f9997f9a69d68654439ced9..7748e17828ef58ab147bc213bff6afda69a6f05d 100644 (file)
@@ -1109,10 +1109,12 @@ static void pci230_handle_ao_nofifo(struct comedi_device *dev,
        }
 }
 
-/* Loads DAC FIFO (if using it) from buffer. */
-/* Returns 0 if AO finished due to completion or error, 1 if still going. */
-static int pci230_handle_ao_fifo(struct comedi_device *dev,
-                                struct comedi_subdevice *s)
+/*
+ * Loads DAC FIFO (if using it) from buffer.
+ * Returns false if AO finished due to completion or error, true if still going.
+ */
+static bool pci230_handle_ao_fifo(struct comedi_device *dev,
+                                 struct comedi_subdevice *s)
 {
        struct pci230_private *devpriv = dev->private;
        struct comedi_async *async = s->async;
@@ -1122,7 +1124,7 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev,
        unsigned short dacstat;
        unsigned int i, n;
        unsigned int events = 0;
-       int running;
+       bool running;
 
        /* Get DAC FIFO status. */
        dacstat = inw(devpriv->daqio + PCI230_DACCON);
@@ -1207,9 +1209,9 @@ static int pci230_handle_ao_fifo(struct comedi_device *dev,
        if (events & (COMEDI_CB_EOA | COMEDI_CB_ERROR | COMEDI_CB_OVERFLOW)) {
                /* Stopping AO due to completion or error. */
                pci230_ao_stop(dev, s);
-               running = 0;
+               running = false;
        } else {
-               running = 1;
+               running = true;
        }
        async->events |= events;
        return running;
@@ -1267,7 +1269,7 @@ static void pci230_ao_start(struct comedi_device *dev,
        if (devpriv->hwver >= 2) {
                /* Using DAC FIFO. */
                unsigned short scantrig;
-               int run;
+               bool run;
 
                /* Preload FIFO data. */
                run = pci230_handle_ao_fifo(dev, s);