diff options
| author |   H Hartley Sweeten <hsweeten@visionengravers.com> | 2013-12-09 15:31:09 -0700 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-12-17 10:02:13 -0800 |
| commit | 518bf39f74b2a2493c1023bed556ee65a282c098 (patch) | |
| tree | 8553e019304bac77e13c688aae37405c71e1f732 /drivers/staging/comedi/drivers/pcmmio.c | |
| parent | staging: comedi: pcmmio: remove 'asic_chan' from subdevice private data (diff) | |
| download | linux-dev-518bf39f74b2a2493c1023bed556ee65a282c098.tar.xz linux-dev-518bf39f74b2a2493c1023bed556ee65a282c098.zip | |
staging: comedi: pcmmio: remove 'num_asic_chans' from subdevice private data
The 'num_asic_chans' that support interrupts in the interrupt subdevice is
always initialized to '24'. 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>
Diffstat (limited to 'drivers/staging/comedi/drivers/pcmmio.c')
| -rw-r--r-- | drivers/staging/comedi/drivers/pcmmio.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/staging/comedi/drivers/pcmmio.c b/drivers/staging/comedi/drivers/pcmmio.c index 0a6eb50a722e..8e00d12d7b1b 100644 --- a/drivers/staging/comedi/drivers/pcmmio.c +++ b/drivers/staging/comedi/drivers/pcmmio.c @@ -210,11 +210,6 @@ struct pcmmio_subdev_private { /* The below is only used for intr subdevices */ struct { /* - * the number of asic channels in this subdev - * that have interrutps - */ - int num_asic_chans; - /* * subdev-relative channel mask for channels * we are interested in */ @@ -448,9 +443,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d) unsigned mytrig = ((triggered >> 0) & - ((0x1 << subpriv-> - dio.intr. - num_asic_chans) - + ((0x1 << 24) - 1)) << 0; if (mytrig & subpriv->dio. @@ -535,7 +528,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; + nports = 24 / CHANS_PER_PORT; firstport = 0 / CHANS_PER_PORT; if (cmd->chanlist) { for (n = 0; n < cmd->chanlist_len; n++) { @@ -546,7 +539,7 @@ static int pcmmio_start_intr(struct comedi_device *dev, << CR_CHAN(cmd->chanlist[n]); } } - bits &= ((0x1 << subpriv->dio.intr.num_asic_chans) - 1) << 0; + bits &= ((0x1 << 24) - 1) << 0; subpriv->dio.intr.enabled_mask = bits; { @@ -956,7 +949,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.num_asic_chans = 24; spin_lock_init(&subpriv->dio.intr.spinlock); |