Commit 8fba3e5b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b346c318
...@@ -214,11 +214,6 @@ struct pcmmio_subdev_private { ...@@ -214,11 +214,6 @@ struct pcmmio_subdev_private {
* that have interrutps * that have interrutps
*/ */
int num_asic_chans; 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 * subdev-relative channel mask for channels
* we are interested in * we are interested in
...@@ -451,8 +446,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d) ...@@ -451,8 +446,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
if (subpriv->dio.intr.active) { if (subpriv->dio.intr.active) {
unsigned mytrig = unsigned mytrig =
((triggered >> ((triggered >> 0)
subpriv->dio.intr.asic_chan)
& &
((0x1 << subpriv-> ((0x1 << subpriv->
dio.intr. dio.intr.
...@@ -542,7 +536,7 @@ static int pcmmio_start_intr(struct comedi_device *dev, ...@@ -542,7 +536,7 @@ static int pcmmio_start_intr(struct comedi_device *dev,
subpriv->dio.intr.enabled_mask = 0; subpriv->dio.intr.enabled_mask = 0;
subpriv->dio.intr.active = 1; subpriv->dio.intr.active = 1;
nports = subpriv->dio.intr.num_asic_chans / CHANS_PER_PORT; 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) { if (cmd->chanlist) {
for (n = 0; n < cmd->chanlist_len; n++) { for (n = 0; n < cmd->chanlist_len; n++) {
bits |= (1U << CR_CHAN(cmd->chanlist[n])); bits |= (1U << CR_CHAN(cmd->chanlist[n]));
...@@ -962,7 +956,6 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it) ...@@ -962,7 +956,6 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
subpriv = s->private; subpriv = s->private;
subpriv->dio.intr.active = 0; subpriv->dio.intr.active = 0;
subpriv->dio.intr.stop_count = 0; subpriv->dio.intr.stop_count = 0;
subpriv->dio.intr.asic_chan = 0;
subpriv->dio.intr.num_asic_chans = 24; subpriv->dio.intr.num_asic_chans = 24;
spin_lock_init(&subpriv->dio.intr.spinlock); spin_lock_init(&subpriv->dio.intr.spinlock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment