leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: comedi: dt282x: tidy up dt282x_ao_dma_interrupt()

Browse Source 
The main interrupt handler already has the comedi_subdevice pointer
needed in this function. Pass that subdevice pointer so that it does
not need to be fetched as a local variable.

Tidy up the function a bit.

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-06-20 13:12:48 -07:00 committed by Greg Kroah-Hartman
parent ecac148c60
commit e6cff3990d
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/staging/comedi/drivers/dt282x.c
View File

@ -461,31 +461,27 @@ static void dt282x_munge(struct comedi_device *dev,
} }
} }
static void dt282x_ao_dma_interrupt(struct comedi_device *dev) static void dt282x_ao_dma_interrupt(struct comedi_device *dev,
struct comedi_subdevice *s)
{ {
struct dt282x_private *devpriv = dev->private; struct dt282x_private *devpriv = dev->private;
struct comedi_subdevice *s = dev->write_subdev; int cur_dma = devpriv->current_dma_index;
void *ptr; void *ptr = devpriv->dma[cur_dma].buf;
int size; int size;
int i;
outw(devpriv->supcsr | DT2821_CLRDMADNE, dev->iobase + DT2821_SUPCSR); outw(devpriv->supcsr | DT2821_CLRDMADNE, dev->iobase + DT2821_SUPCSR);
i = devpriv->current_dma_index; disable_dma(devpriv->dma[cur_dma].chan);
ptr = devpriv->dma[i].buf;
disable_dma(devpriv->dma[i].chan); devpriv->current_dma_index = 1 - cur_dma;
devpriv->current_dma_index = 1 - i;
size = cfc_read_array_from_buffer(s, ptr, devpriv->dma_maxsize); size = cfc_read_array_from_buffer(s, ptr, devpriv->dma_maxsize);
if (size == 0) { if (size == 0) {
dev_err(dev->class_dev, "AO underrun\n"); dev_err(dev->class_dev, "AO underrun\n");
s->async->events |= COMEDI_CB_OVERFLOW; s->async->events |= COMEDI_CB_OVERFLOW;
return; } else {
dt282x_prep_ao_dma(dev, cur_dma, size);
} }
dt282x_prep_ao_dma(dev, i, size);
return;
} }
static void dt282x_ai_dma_interrupt(struct comedi_device *dev) static void dt282x_ai_dma_interrupt(struct comedi_device *dev)
@ -556,7 +552,7 @@ static irqreturn_t dt282x_interrupt(int irq, void *d)
if (devpriv->dma_dir == DMA_MODE_READ) if (devpriv->dma_dir == DMA_MODE_READ)
dt282x_ai_dma_interrupt(dev); dt282x_ai_dma_interrupt(dev);
else else
dt282x_ao_dma_interrupt(dev); dt282x_ao_dma_interrupt(dev, s_ao);
handled = 1; handled = 1;
} }
if (adcsr & DT2821_ADERR) { if (adcsr & DT2821_ADERR) {