evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: pcmmio: remove 'first_chan' from subdevice private data

Browse source 
The 'first_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>
This commit is contained in:
H Hartley Sweeten 2013-12-09 15:31:07 -07:00 • committed by Greg Kroah-Hartman
parent 8c41e9f41b
commit b346c318b7
1 changed files with 7 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/staging/comedi/drivers/pcmmio.c
View file

@ -209,11 +209,6 @@ struct pcmmio_subdev_private {
/* The below is only used for intr subdevices */
struct {
/*
* if nonnegative, the first channel id for
* interrupts.
*/
int first_chan;
/*
* the number of asic channels in this subdev
* that have interrutps
@ -462,8 +457,7 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
((0x1 << subpriv->
dio.intr.
num_asic_chans) -
1)) << subpriv->
dio.intr.first_chan;
1)) << 0;
if (mytrig &
subpriv->dio.
intr.enabled_mask) {
@ -558,8 +552,7 @@ static int pcmmio_start_intr(struct comedi_device *dev,
<< CR_CHAN(cmd->chanlist[n]);
}
}
bits &= ((0x1 << subpriv->dio.intr.num_asic_chans) -
1) << subpriv->dio.intr.first_chan;
bits &= ((0x1 << subpriv->dio.intr.num_asic_chans) - 1) << 0;
subpriv->dio.intr.enabled_mask = bits;
{
@ -581,12 +574,11 @@ static int pcmmio_start_intr(struct comedi_device *dev,
switch_page(dev, PCMMIO_PAGE_ENAB);
for (port = firstport; port < firstport + nports; ++port) {
unsigned enab =
bits >> (subpriv->dio.intr.first_chan + (port -
firstport)
* 8) & 0xff, pol =
pol_bits >> (subpriv->dio.intr.first_chan +
(port - firstport) * 8) & 0xff;
unsigned enab, pol;
enab = bits >> (0 + (port - firstport) * 8) & 0xff;
pol = pol_bits >> (0 + (port - firstport) * 8) & 0xff;
/* set enab intrs for this subdev.. */
outb(enab, dev->iobase + PCMMIO_PAGE_REG(port));
switch_page(dev, PCMMIO_PAGE_POL);
@ -970,7 +962,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.first_chan = 0;
subpriv->dio.intr.asic_chan = 0;
subpriv->dio.intr.num_asic_chans = 24;