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

staging: comedi: adl_pci9118: enable DMA in common code path

Browse Source 
The pci9118_ai_docmd_dma() function enables the DMA bit in the ai control
register for all acquisition modes. For aesthetics, move the enable of
this bit into the (*do_cmd).

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-09-09 13:05:51 -07:00 committed by Greg Kroah-Hartman
parent 4cf13a1dc8
commit d900197e9e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/staging/comedi/drivers/adl_pci9118.c
View File

@ -1139,12 +1139,10 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
switch (devpriv->ai_do) {
case 1:
devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR |
PCI9118_AI_CTRL_DMA;
devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR;
break;
case 2:
devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR |
PCI9118_AI_CTRL_DMA;
devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR;
devpriv->ai_cfg |= PCI9118_AI_CFG_BM |
PCI9118_AI_CFG_BS;
if (cmd->convert_src == TRIG_NOW && !devpriv->softsshdelay)
@ -1153,12 +1151,10 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
dev->iobase + PCI9118_AI_BURST_NUM_REG);
break;
case 3:
devpriv->ai_ctrl |= PCI9118_AI_CTRL_EXTM |
PCI9118_AI_CTRL_DMA;
devpriv->ai_ctrl |= PCI9118_AI_CTRL_EXTM;
break;
case 4:
devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR |
PCI9118_AI_CTRL_DMA;
devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR;
devpriv->ai_cfg |= PCI9118_AI_CFG_AM;
outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
pci9118_timer_set_mode(dev, 0, I8254_MODE0);
@ -1346,6 +1342,9 @@ static int pci9118_ai_cmd(struct comedi_device *dev, struct comedi_subdevice *s)
devpriv->ai_do = 3;
}
if (devpriv->usedma)
devpriv->ai_ctrl |= PCI9118_AI_CTRL_DMA;
pci9118_start_pacer(dev, -1); /* stop pacer */
/* set default config (disable burst and triggers) */