diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-02-17 14:27:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 11:56:50 -0800 |
| commit | c8bc43ec67cd113892c5eb9dd22d3bf35fb38662 (patch) | |
| tree | 9c0f81f751626b4356dc178aba71712a741c2e0c /drivers | |
| parent | e5143adb18a90346d9f24229188f054853410998 (diff) | |
staging: comedi: pcl818: rename 'irq_blocked' in private data
This member in the private data is a flag that indicates that an analog
input async command is currently running. Rename it to make this clear.
The private data is kzalloc'ed in the attach so remove the unnecessary
clearing of this flag.
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')
| -rw-r--r-- | drivers/staging/comedi/drivers/pcl818.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/staging/comedi/drivers/pcl818.c b/drivers/staging/comedi/drivers/pcl818.c index 8be7cb99708d..2b2e7e698b91 100644 --- a/drivers/staging/comedi/drivers/pcl818.c +++ b/drivers/staging/comedi/drivers/pcl818.c @@ -331,7 +331,7 @@ struct pcl818_private { unsigned int divisor1; unsigned int divisor2; unsigned int usefifo:1; - unsigned int irq_blocked:1; + unsigned int ai_cmd_running:1; unsigned int irq_was_now_closed:1; unsigned int neverending_ai:1; }; @@ -727,7 +727,7 @@ static irqreturn_t interrupt_pcl818(int irq, void *d) return IRQ_HANDLED; } - if (devpriv->irq_blocked && devpriv->irq_was_now_closed) { + if (devpriv->ai_cmd_running && devpriv->irq_was_now_closed) { if ((devpriv->neverending_ai || (!devpriv->neverending_ai && devpriv->ai_act_scan > 0)) && (devpriv->ai_mode == INT_TYPE_AI1_DMA || @@ -763,7 +763,7 @@ static irqreturn_t interrupt_pcl818(int irq, void *d) outb(0, dev->iobase + PCL818_CLRINT); /* clear INT request */ - if (!devpriv->irq_blocked || !devpriv->ai_mode) { + if (!devpriv->ai_cmd_running || !devpriv->ai_mode) { comedi_error(dev, "bad IRQ!"); return IRQ_NONE; } @@ -824,7 +824,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev, struct comedi_cmd *cmd = &s->async->cmd; unsigned int seglen; - if (devpriv->irq_blocked) + if (devpriv->ai_cmd_running) return -EBUSY; pcl818_start_pacer(dev, false); @@ -838,7 +838,7 @@ static int pcl818_ai_cmd_mode(int mode, struct comedi_device *dev, devpriv->ai_act_scan = cmd->stop_arg; devpriv->ai_act_chan = 0; - devpriv->irq_blocked = 1; + devpriv->ai_cmd_running = 1; devpriv->irq_was_now_closed = 0; devpriv->act_chanlist_pos = 0; devpriv->dma_runs_to_end = 0; @@ -1099,7 +1099,7 @@ static int pcl818_ai_cancel(struct comedi_device *dev, { struct pcl818_private *devpriv = dev->private; - if (devpriv->irq_blocked > 0) { + if (devpriv->ai_cmd_running) { devpriv->irq_was_now_closed = 1; switch (devpriv->ai_mode) { @@ -1128,7 +1128,7 @@ static int pcl818_ai_cancel(struct comedi_device *dev, outb(0, dev->iobase + PCL818_FI_FLUSH); outb(0, dev->iobase + PCL818_FI_ENABLE); } - devpriv->irq_blocked = 0; + devpriv->ai_cmd_running = 0; devpriv->neverending_ai = 0; devpriv->ai_mode = 0; devpriv->irq_was_now_closed = 0; @@ -1287,7 +1287,6 @@ static int pcl818_attach(struct comedi_device *dev, struct comedi_devconfig *it) dev->irq = it->options[1]; } - devpriv->irq_blocked = 0; /* number of subdevice which use IRQ */ devpriv->ai_mode = 0; /* mode of irq */ /* we need an IRQ to do DMA on channel 3 or 1 */ |