tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: comedi: pcl816: rename 'irq_blocked' in private data

Browse Source 
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.

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
2014-02-19 10:11:28 -07:00
committed by Greg Kroah-Hartman
parent efd5b7b5d7
commit 94349cb9cb
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/staging/comedi/drivers/pcl816.c
+6 -6
View File
@@ -122,7 +122,7 @@ struct pcl816_private {
unsigned int ai_poll_ptr; /* how many sampes transfer poll */
unsigned int divisor1;
unsigned int divisor2;
unsigned int irq_blocked:1;
unsigned int ai_cmd_running:1;
unsigned int irq_was_now_closed:1;
unsigned int ai_neverending:1;
};
@@ -370,7 +370,7 @@ static irqreturn_t interrupt_pcl816(int irq, void *d)
}
outb(0, dev->iobase + PCL816_CLRINT); /* clear INT request */
if (!dev->irq || !devpriv->irq_blocked || !devpriv->int816_mode) {
if (!dev->irq || !devpriv->ai_cmd_running || !devpriv->int816_mode) {
if (devpriv->irq_was_now_closed) {
devpriv->irq_was_now_closed = 0;
/* comedi_error(dev,"last IRQ.."); */
@@ -471,7 +471,7 @@ static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
unsigned int dma_flags, bytes, dmairq;
unsigned int seglen;
if (devpriv->irq_blocked)
if (devpriv->ai_cmd_running)
return -EBUSY;
pcl816_start_pacer(dev, false);
@@ -484,7 +484,7 @@ static int pcl816_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->ai_act_scan = 0;
s->async->cur_chan = 0;
devpriv->irq_blocked = 1;
devpriv->ai_cmd_running = 1;
devpriv->ai_poll_ptr = 0;
devpriv->irq_was_now_closed = 0;
@@ -601,7 +601,7 @@ static int pcl816_ai_cancel(struct comedi_device *dev,
{
struct pcl816_private *devpriv = dev->private;
if (devpriv->irq_blocked) {
if (devpriv->ai_cmd_running) {
switch (devpriv->int816_mode) {
case INT_TYPE_AI1_DMA:
case INT_TYPE_AI3_DMA:
@@ -627,7 +627,7 @@ static int pcl816_ai_cancel(struct comedi_device *dev,
/* Stop A/D */
outb(0, dev->iobase + PCL816_CONTROL);
devpriv->irq_blocked = 0;
devpriv->ai_cmd_running = 0;
devpriv->irq_was_now_closed = 1;
devpriv->int816_mode = 0;
/* s->busy = 0; */