diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-06-18 13:22:07 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-24 15:51:01 -0700 |
| commit | d9990ceacc39b4320661adf7778538858a5c4bad (patch) | |
| tree | aac6a1e7cac041d419e82bce43b55d761651ecb5 | |
| parent | 3de38f258f95b6dc9f614e1f64b8d596a75533e0 (diff) | |
| download | linux-d9990ceacc39b4320661adf7778538858a5c4bad.tar.bz2 | |
staging: comedi: pcmuio: remove 'first_chan'
This member of the subdevice private data is always initialize to
'0' due to the 'byte_no' always being zero when it is set during
the attach. Simplify the driver a bit by removing it.
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>
| -rw-r--r-- | drivers/staging/comedi/drivers/pcmuio.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/pcmuio.c b/drivers/staging/comedi/drivers/pcmuio.c index 0e71eacae14b..8771e4b5d4cb 100644 --- a/drivers/staging/comedi/drivers/pcmuio.c +++ b/drivers/staging/comedi/drivers/pcmuio.c @@ -152,8 +152,6 @@ struct pcmuio_subdev_private { struct { /* if non-negative, this subdev has an interrupt asic */ int asic; - /* if nonnegative, the first channel id for interrupts */ - int first_chan; /* * the number of asic channels in this * subdev that have interrutps @@ -377,7 +375,6 @@ static void pcmuio_handle_intr_subdev(struct comedi_device *dev, mytrig = triggered >> subpriv->intr.asic_chan; mytrig &= ((0x1 << subpriv->intr.num_asic_chans) - 1); - mytrig <<= subpriv->intr.first_chan; if (!(mytrig & subpriv->intr.enabled_mask)) goto done; @@ -520,8 +517,7 @@ static int pcmuio_start_intr(struct comedi_device *dev, << CR_CHAN(cmd->chanlist[n]); } } - bits &= ((0x1 << subpriv->intr.num_asic_chans) - - 1) << subpriv->intr.first_chan; + bits &= ((0x1 << subpriv->intr.num_asic_chans) - 1); subpriv->intr.enabled_mask = bits; /* set pol and enab intrs for this subdev.. */ @@ -727,7 +723,6 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it) s->insn_config = pcmuio_dio_insn_config; s->n_chan = min(chans_left, MAX_CHANS_PER_SUBDEV); subpriv->intr.asic = -1; - subpriv->intr.first_chan = -1; subpriv->intr.asic_chan = -1; subpriv->intr.num_asic_chans = -1; subpriv->intr.active = 0; @@ -752,10 +747,8 @@ static int pcmuio_attach(struct comedi_device *dev, struct comedi_devconfig *it) subpriv->intr.asic = asic; subpriv->intr.active = 0; subpriv->intr.stop_count = 0; - subpriv->intr.first_chan = byte_no * 8; subpriv->intr.asic_chan = thisasic_chanct; - subpriv->intr.num_asic_chans = - s->n_chan - subpriv->intr.first_chan; + subpriv->intr.num_asic_chans = s->n_chan; dev->read_subdev = s; s->subdev_flags |= SDF_CMD_READ; s->cancel = pcmuio_cancel; |