diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-09 15:31:08 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 10:02:13 -0800 |
| commit | 8fba3e5b1fd9c615f607f87bbf2682c45ec7d31d (patch) | |
| tree | e076bba9ba00f9d689c97e110e906f4f27a0161c | |
| parent | b346c318b7e1ec33149f79af3040b28bf3d74e39 (diff) | |
staging: comedi: pcmmio: remove 'asic_chan' from subdevice private data
The first 'asic_chan' that supports interrupts in the interrupt subdevice is
always initialized to '0'. Remove this unneeded information from the subdevice
private data.
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/pcmmio.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index cbc81a7e8270..0a6eb50a722e 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c @@ -215,11 +215,6 @@ struct pcmmio_subdev_private { */ int num_asic_chans; /* - * if nonnegative, the first channel id with - * respect to the asic that has interrupts - */ - int asic_chan; - /* * subdev-relative channel mask for channels * we are interested in */ @@ -451,8 +446,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d) if (subpriv->dio.intr.active) { unsigned mytrig = - ((triggered >> - subpriv->dio.intr.asic_chan) + ((triggered >> 0) & ((0x1 << subpriv-> dio.intr. @@ -542,7 +536,7 @@ static int pcmmio_start_intr(struct comedi_device *dev, subpriv->dio.intr.enabled_mask = 0; subpriv->dio.intr.active = 1; nports = subpriv->dio.intr.num_asic_chans / CHANS_PER_PORT; - firstport = subpriv->dio.intr.asic_chan / CHANS_PER_PORT; + firstport = 0 / CHANS_PER_PORT; if (cmd->chanlist) { for (n = 0; n < cmd->chanlist_len; n++) { bits |= (1U << CR_CHAN(cmd->chanlist[n])); @@ -962,7 +956,6 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it) subpriv = s->private; subpriv->dio.intr.active = 0; subpriv->dio.intr.stop_count = 0; - subpriv->dio.intr.asic_chan = 0; subpriv->dio.intr.num_asic_chans = 24; spin_lock_init(&subpriv->dio.intr.spinlock); |