FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-25 06:53:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: comedi: adl_pci9118: tidy up 'ai_cfg' in pci9118_ai_docmd_dma()

Browse Source 
The 'ai_cfg' was already set to PCI9118_AI_CFG_PDTRG | PCI9118_AI_CFG_PETRG.
Don't bother setting those bits in pci9118_ai_docmd_dma().

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:50 -07:00 committed by Greg Kroah-Hartman
parent f3d3dad659
commit 4cf13a1dc8
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1145,10 +1145,8 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
case 2:
devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR |
PCI9118_AI_CTRL_DMA;
devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG |
PCI9118_AI_CFG_PETRG |
PCI9118_AI_CFG_BM |
PCI9118_AI_CFG_BS;
devpriv->ai_cfg |= PCI9118_AI_CFG_BM |
PCI9118_AI_CFG_BS;
if (cmd->convert_src == TRIG_NOW && !devpriv->softsshdelay)
devpriv->ai_cfg |= PCI9118_AI_CFG_BSSH;
outl(devpriv->ai_n_realscanlen,
@ -1157,15 +1155,11 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
case 3:
devpriv->ai_ctrl |= PCI9118_AI_CTRL_EXTM |
PCI9118_AI_CTRL_DMA;
devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG |
PCI9118_AI_CFG_PETRG;
break;
case 4:
devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR |
PCI9118_AI_CTRL_DMA;
devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG |
PCI9118_AI_CFG_PETRG |
PCI9118_AI_CFG_AM;
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);
pci9118_timer_write(dev, 0, dmabuf->hw >> 1);