openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: comedi: pcmmio: return void from pcmmio_start_intr() 

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 <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2014-09-09 16:15:55 -07:00 committed by Greg Kroah-Hartman
parent 811ba919e4
commit 22499048e3
1 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/staging/comedi/drivers/pcmmio.c
View File

@ -406,8 +406,8 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
} }
/* devpriv->spinlock is already locked */ /* devpriv->spinlock is already locked */
static int pcmmio_start_intr(struct comedi_device *dev, static void pcmmio_start_intr(struct comedi_device *dev,
struct comedi_subdevice *s) struct comedi_subdevice *s)
{ {
struct pcmmio_private *devpriv = dev->private; struct pcmmio_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
@ -434,8 +434,6 @@ static int pcmmio_start_intr(struct comedi_device *dev,
/* set polarity and enable interrupts */ /* set polarity and enable interrupts */
pcmmio_dio_write(dev, pol_bits, PCMMIO_PAGE_POL, 0); pcmmio_dio_write(dev, pol_bits, PCMMIO_PAGE_POL, 0);
pcmmio_dio_write(dev, bits, PCMMIO_PAGE_ENAB, 0); pcmmio_dio_write(dev, bits, PCMMIO_PAGE_ENAB, 0);
return 0;
} }
static int pcmmio_cancel(struct comedi_device *dev, struct comedi_subdevice *s) static int pcmmio_cancel(struct comedi_device *dev, struct comedi_subdevice *s)
@ -458,7 +456,6 @@ static int pcmmio_inttrig_start_intr(struct comedi_device *dev,
struct pcmmio_private *devpriv = dev->private; struct pcmmio_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
unsigned long flags; unsigned long flags;
int event = 0;
if (trig_num != cmd->start_arg) if (trig_num != cmd->start_arg)
return -EINVAL; return -EINVAL;
@ -466,12 +463,9 @@ static int pcmmio_inttrig_start_intr(struct comedi_device *dev,
spin_lock_irqsave(&devpriv->spinlock, flags); spin_lock_irqsave(&devpriv->spinlock, flags);
s->async->inttrig = NULL; s->async->inttrig = NULL;
if (devpriv->active) if (devpriv->active)
event = pcmmio_start_intr(dev, s); pcmmio_start_intr(dev, s);
spin_unlock_irqrestore(&devpriv->spinlock, flags); spin_unlock_irqrestore(&devpriv->spinlock, flags);
if (event)
comedi_event(dev, s);
return 1; return 1;
} }
@ -483,7 +477,6 @@ static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
struct pcmmio_private *devpriv = dev->private; struct pcmmio_private *devpriv = dev->private;
struct comedi_cmd *cmd = &s->async->cmd; struct comedi_cmd *cmd = &s->async->cmd;
unsigned long flags; unsigned long flags;
int event = 0;
spin_lock_irqsave(&devpriv->spinlock, flags); spin_lock_irqsave(&devpriv->spinlock, flags);
devpriv->active = 1; devpriv->active = 1;
@ -494,13 +487,10 @@ static int pcmmio_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
if (cmd->start_src == TRIG_INT) if (cmd->start_src == TRIG_INT)
s->async->inttrig = pcmmio_inttrig_start_intr; s->async->inttrig = pcmmio_inttrig_start_intr;
else /* TRIG_NOW */ else /* TRIG_NOW */
event = pcmmio_start_intr(dev, s); pcmmio_start_intr(dev, s);
spin_unlock_irqrestore(&devpriv->spinlock, flags); spin_unlock_irqrestore(&devpriv->spinlock, flags);
if (event)
comedi_event(dev, s);
return 0; return 0;
} }