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

staging: comedi: hwdrv_apci1564: remove useless code in apci1564_counter_insn_config() 



The gate, trig, and ena, bits in the 'ctrl' are cleared at the start of
the function. There is no reason clear these bits for each step.

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 18543b13

drivers/staging/comedi/drivers/addi-data/hwdrv_apci1564.c

+5 −6
Original line number Diff line number Diff line
@@ -114,24 +114,23 @@ static int apci1564_counter_insn_config(struct comedi_device *dev, 


	/* Set the mode */

	ctrl &= ~(ADDI_TCW_CTRL_EXT_CLK_MASK | ADDI_TCW_CTRL_MODE_MASK |

		  ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG |

		  ADDI_TCW_CTRL_TIMER_ENA | ADDI_TCW_CTRL_RESET_ENA |

		  ADDI_TCW_CTRL_WARN_ENA | ADDI_TCW_CTRL_ENA);

		  ADDI_TCW_CTRL_WARN_ENA);

	ctrl |= ADDI_TCW_CTRL_CNTR_ENA | ADDI_TCW_CTRL_EXT_CLK(data[4]);

	outl(ctrl, iobase + ADDI_TCW_CTRL_REG);



	/* Enable or Disable Interrupt */

	ctrl &= ~(ADDI_TCW_CTRL_GATE | ADDI_TCW_CTRL_TRIG |

		  ADDI_TCW_CTRL_IRQ_ENA);

	if (data[1])

		ctrl |= ADDI_TCW_CTRL_IRQ_ENA;

	else

		ctrl &= ~ADDI_TCW_CTRL_IRQ_ENA;

	outl(ctrl, iobase + ADDI_TCW_CTRL_REG);



	/* Set the Up/Down selection */

	ctrl &= ~(ADDI_TCW_CTRL_CNT_UP | ADDI_TCW_CTRL_GATE |

		  ADDI_TCW_CTRL_TRIG);

	if (data[6])

		ctrl |= ADDI_TCW_CTRL_CNT_UP;

	else

		ctrl &= ~ADDI_TCW_CTRL_CNT_UP;

	outl(ctrl, iobase + ADDI_TCW_CTRL_REG);



	return insn->n;