]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: comedi: adl_pci9118: tidy up 'ai_cfg' in pci9118_ai_docmd_dma()
authorH Hartley Sweeten <hsweeten@visionengravers.com>
Tue, 9 Sep 2014 20:05:50 +0000 (13:05 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 11 Sep 2014 21:34:25 +0000 (14:34 -0700)
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>
drivers/staging/comedi/drivers/adl_pci9118.c

index 5961fefebf3ff8e451c888bb284cf12fd1b61938..48064c20103d6b106c932e657509f768fadc3a06 100644 (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);