[PATCH 27/34] staging: comedi: pcmuio: return void from pcmuio_start_intr()

[H Hartley Sweeten]

This function always returns '0' so the comedi_event() is never done by the
callers.

Change the return type to void and remove the comedi_event() dead code.

Signed-off-by: H Hartley Sweeten <hswee...@visionengravers.com>
Cc: Ian Abbott <abbo...@mev.co.uk>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 drivers/staging/comedi/drivers/pcmuio.c | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/comedi/drivers/pcmuio.c 
b/drivers/staging/comedi/drivers/pcmuio.c
index 66fe429..b9a93d7 100644
--- a/drivers/staging/comedi/drivers/pcmuio.c
+++ b/drivers/staging/comedi/drivers/pcmuio.c
@@ -403,8 +403,8 @@ static irqreturn_t pcmuio_interrupt(int irq, void *d)
 }
 
 /* chip->spinlock is already locked */
-static int pcmuio_start_intr(struct comedi_device *dev,
-                            struct comedi_subdevice *s)
+static void pcmuio_start_intr(struct comedi_device *dev,
+                             struct comedi_subdevice *s)
 {
        struct pcmuio_private *devpriv = dev->private;
        int asic = pcmuio_subdevice_to_asic(s);
@@ -433,8 +433,6 @@ static int pcmuio_start_intr(struct comedi_device *dev,
        /* set pol and enab intrs for this subdev.. */
        pcmuio_write(dev, pol_bits, asic, PCMUIO_PAGE_POL, 0);
        pcmuio_write(dev, bits, asic, PCMUIO_PAGE_ENAB, 0);
-
-       return 0;
 }
 
 static int pcmuio_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
@@ -461,7 +459,6 @@ static int pcmuio_inttrig_start_intr(struct comedi_device 
*dev,
        int asic = pcmuio_subdevice_to_asic(s);
        struct pcmuio_asic *chip = &devpriv->asics[asic];
        unsigned long flags;
-       int event = 0;
 
        if (trig_num != cmd->start_arg)
                return -EINVAL;
@@ -469,13 +466,10 @@ static int pcmuio_inttrig_start_intr(struct comedi_device 
*dev,
        spin_lock_irqsave(&chip->spinlock, flags);
        s->async->inttrig = NULL;
        if (chip->active)
-               event = pcmuio_start_intr(dev, s);
+               pcmuio_start_intr(dev, s);
 
        spin_unlock_irqrestore(&chip->spinlock, flags);
 
-       if (event)
-               comedi_event(dev, s);
-
        return 1;
 }
 
@@ -489,7 +483,6 @@ static int pcmuio_cmd(struct comedi_device *dev, struct 
comedi_subdevice *s)
        int asic = pcmuio_subdevice_to_asic(s);
        struct pcmuio_asic *chip = &devpriv->asics[asic];
        unsigned long flags;
-       int event = 0;
 
        spin_lock_irqsave(&chip->spinlock, flags);
        chip->active = 1;
@@ -500,13 +493,10 @@ static int pcmuio_cmd(struct comedi_device *dev, struct 
comedi_subdevice *s)
        if (cmd->start_src == TRIG_INT)
                s->async->inttrig = pcmuio_inttrig_start_intr;
        else    /* TRIG_NOW */
-               event = pcmuio_start_intr(dev, s);
+               pcmuio_start_intr(dev, s);
 
        spin_unlock_irqrestore(&chip->spinlock, flags);
 
-       if (event)
-               comedi_event(dev, s);
-
        return 0;
 }
 
-- 
2.0.3

_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel