github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-08-02 05:12:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

staging: comedi: pcmmio: remove 'asic' member from subdevice private data

Browse Source 
This member of the subdevice private data is always initialized to '0' by
the only subdevice that uses it. Since we only have one asic on the board
it's really not needed. Just remove 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>
This commit is contained in:
H Hartley Sweeten 2013-12-09 15:31:06 -07:00 committed by Greg Kroah-Hartman
parent 1786bd7503
commit 8c41e9f41b
1 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
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 non-negative, this subdev has an
* interrupt asic
*/
int asic;
/*
* if nonnegative, the first channel id for
* interrupts.
@ -450,11 +445,6 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
* TODO here: dispatch io lines to subdevs
* with commands..
*/
/*
* this is an interrupt subdev,
* and it matches this asic!
*/
if (subpriv->dio.intr.asic == 0) {
unsigned long flags;
unsigned oldevents;
@ -533,8 +523,6 @@ static irqreturn_t interrupt_pcmmio(int irq, void *d)
comedi_event(dev, s);
}
}
}
if (!got1)
@ -554,13 +542,9 @@ static int pcmmio_start_intr(struct comedi_device *dev,
return 1;
} else {
unsigned bits = 0, pol_bits = 0, n;
int nports, firstport, asic, port;
int nports, firstport, port;
struct comedi_cmd *cmd = &s->async->cmd;
asic = subpriv->dio.intr.asic;
if (asic < 0)
return 1; /* not an interrupt
subdev */
subpriv->dio.intr.enabled_mask = 0;
subpriv->dio.intr.active = 1;
nports = subpriv->dio.intr.num_asic_chans / CHANS_PER_PORT;
@ -984,7 +968,6 @@ static int pcmmio_attach(struct comedi_device *dev, struct comedi_devconfig *it)
s->private = &devpriv->sprivs[2];
subpriv = s->private;
subpriv->dio.intr.asic = 0;
subpriv->dio.intr.active = 0;
subpriv->dio.intr.stop_count = 0;
subpriv->dio.intr.first_chan = 0;