Commit 4cf13a1d authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman

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

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f3d3dad6
...@@ -1145,9 +1145,7 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev, ...@@ -1145,9 +1145,7 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
case 2: case 2:
devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR | devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR |
PCI9118_AI_CTRL_DMA; PCI9118_AI_CTRL_DMA;
devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG | devpriv->ai_cfg |= PCI9118_AI_CFG_BM |
PCI9118_AI_CFG_PETRG |
PCI9118_AI_CFG_BM |
PCI9118_AI_CFG_BS; PCI9118_AI_CFG_BS;
if (cmd->convert_src == TRIG_NOW && !devpriv->softsshdelay) if (cmd->convert_src == TRIG_NOW && !devpriv->softsshdelay)
devpriv->ai_cfg |= PCI9118_AI_CFG_BSSH; devpriv->ai_cfg |= PCI9118_AI_CFG_BSSH;
...@@ -1157,15 +1155,11 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev, ...@@ -1157,15 +1155,11 @@ static int pci9118_ai_docmd_dma(struct comedi_device *dev,
case 3: case 3:
devpriv->ai_ctrl |= PCI9118_AI_CTRL_EXTM | devpriv->ai_ctrl |= PCI9118_AI_CTRL_EXTM |
PCI9118_AI_CTRL_DMA; PCI9118_AI_CTRL_DMA;
devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG |
PCI9118_AI_CFG_PETRG;
break; break;
case 4: case 4:
devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR | devpriv->ai_ctrl |= PCI9118_AI_CTRL_TMRTR |
PCI9118_AI_CTRL_DMA; PCI9118_AI_CTRL_DMA;
devpriv->ai_cfg = PCI9118_AI_CFG_PDTRG | devpriv->ai_cfg |= PCI9118_AI_CFG_AM;
PCI9118_AI_CFG_PETRG |
PCI9118_AI_CFG_AM;
outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG); outl(devpriv->ai_cfg, dev->iobase + PCI9118_AI_CFG_REG);
pci9118_timer_set_mode(dev, 0, I8254_MODE0); pci9118_timer_set_mode(dev, 0, I8254_MODE0);
pci9118_timer_write(dev, 0, dmabuf->hw >> 1); pci9118_timer_write(dev, 0, dmabuf->hw >> 1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment