evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: pcmuio: return void from pcmuio_start_intr()

Browse source 
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:59 -07:00 • committed by Greg Kroah-Hartman
parent 8e7fed7ed7
commit 1e2e39effd
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/staging/comedi/drivers/pcmuio.c
View file

@ -403,7 +403,7 @@ static irqreturn_t pcmuio_interrupt(int irq, void *d)
} }
/* chip->spinlock is already locked */ /* chip->spinlock is already locked */
static int pcmuio_start_intr(struct comedi_device *dev, static void pcmuio_start_intr(struct comedi_device *dev,
struct comedi_subdevice *s) struct comedi_subdevice *s)
{ {
struct pcmuio_private *devpriv = dev->private; struct pcmuio_private *devpriv = dev->private;
@ -433,8 +433,6 @@ static int pcmuio_start_intr(struct comedi_device *dev,
/* set pol and enab intrs for this subdev.. */ /* set pol and enab intrs for this subdev.. */
pcmuio_write(dev, pol_bits, asic, PCMUIO_PAGE_POL, 0); pcmuio_write(dev, pol_bits, asic, PCMUIO_PAGE_POL, 0);
pcmuio_write(dev, bits, asic, PCMUIO_PAGE_ENAB, 0); pcmuio_write(dev, bits, asic, PCMUIO_PAGE_ENAB, 0);
return 0;
} }
static int pcmuio_cancel(struct comedi_device *dev, struct comedi_subdevice *s) 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); int asic = pcmuio_subdevice_to_asic(s);
struct pcmuio_asic *chip = &devpriv->asics[asic]; struct pcmuio_asic *chip = &devpriv->asics[asic];
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;
@ -469,13 +466,10 @@ static int pcmuio_inttrig_start_intr(struct comedi_device *dev,
spin_lock_irqsave(&chip->spinlock, flags); spin_lock_irqsave(&chip->spinlock, flags);
s->async->inttrig = NULL; s->async->inttrig = NULL;
if (chip->active) if (chip->active)
event = pcmuio_start_intr(dev, s); pcmuio_start_intr(dev, s);
spin_unlock_irqrestore(&chip->spinlock, flags); spin_unlock_irqrestore(&chip->spinlock, flags);
if (event)
comedi_event(dev, s);
return 1; 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); int asic = pcmuio_subdevice_to_asic(s);
struct pcmuio_asic *chip = &devpriv->asics[asic]; struct pcmuio_asic *chip = &devpriv->asics[asic];
unsigned long flags; unsigned long flags;
int event = 0;
spin_lock_irqsave(&chip->spinlock, flags); spin_lock_irqsave(&chip->spinlock, flags);
chip->active = 1; 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) if (cmd->start_src == TRIG_INT)
s->async->inttrig = pcmuio_inttrig_start_intr; s->async->inttrig = pcmuio_inttrig_start_intr;
else /* TRIG_NOW */ else /* TRIG_NOW */
event = pcmuio_start_intr(dev, s); pcmuio_start_intr(dev, s);
spin_unlock_irqrestore(&chip->spinlock, flags); spin_unlock_irqrestore(&chip->spinlock, flags);
if (event)
comedi_event(dev, s);
return 0; return 0;
} }