Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/comedi/drivers/adl_pci9118.c

+3 −9
Original line number Diff line number Diff line
@@ -1145,9 +1145,7 @@ 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 |

		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;
@@ -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);