iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: pcmuio: remove unnecessary mask of triggered channels

Browse Source 
The 'triggered' value is read directly from the three trigger id
registers and does not have any extra data that needs masked off.
Remove the 'mytrig' local variable and just use 'triggered' directly.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-12-05 16:54:09 -07:00 committed by Greg Kroah-Hartman
parent beecd01b72
commit d3d2d75da5
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/comedi/drivers/pcmuio.c
View File

@ -297,7 +297,6 @@ static void pcmuio_handle_intr_subdev(struct comedi_device *dev,
unsigned oldevents = s->async->events;
unsigned int val = 0;
unsigned long flags;
unsigned mytrig;
unsigned int i;
spin_lock_irqsave(&chip->spinlock, flags);
@ -305,16 +304,13 @@ static void pcmuio_handle_intr_subdev(struct comedi_device *dev,
if (!chip->active)
goto done;
mytrig = triggered;
mytrig &= ((0x1 << s->n_chan) - 1);
if (!(mytrig & chip->enabled_mask))
if (!(triggered & chip->enabled_mask))
goto done;
for (i = 0; i < len; i++) {
unsigned int chan = CR_CHAN(s->async->cmd.chanlist[i]);
if (mytrig & (1U << chan))
val |= (1U << i);
if (triggered & (1 << chan))
val |= (1 << i);
}
/* Write the scan to the buffer. */