kernel: remove sw trick for remaining shots

Now the hardware does not make any distinction between single-shot and multi-shot. The "remaining shot" register work transparently for both Signed-off-by: Federico Vaga <federico.vaga@cern.ch>

kernel: remove sw trick for remaining shots
Now the hardware does not make any distinction between single-shot and multi-shot. The "remaining shot" register work transparently for both Signed-off-by: Federico Vaga <federico.vaga@cern.ch>
f6f4b122 · Federico Vaga · a6a3d20d · f6f4b122
Commit f6f4b122 authored Apr 18, 2016 by Federico Vaga
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 12 deletions

fa-irq.c kernel/fa-irq.c +7 -12

No files found.
--- a/kernel/fa-irq.c
+++ b/kernel/fa-irq.c
@@ -227,19 +227,14 @@ void zfat_irq_acq_end(struct zio_cset *cset)
 	 * This ultimate check is not crucial because the HW implements
 	 * a solid state machine and acq-end can happens only after
 	 * the execution of the n requested shots.
-	 *
-	 * FIXME (v4.0) this work only for multi-shot acquisition
 	 */
-	fa->n_fires = fa->n_shots;
-	if (fa->n_shots > 1) {
-		fa->n_fires -= fa_readl(fa, fa->fa_adc_csr_base,
-				&zfad_regs[ZFAT_SHOTS_REM]);
-
-		if (fa->n_fires != fa->n_shots) {
-			dev_err(&fa->fmc->dev,
-				"Expected %i trigger fires, but %i occurs\n",
-				fa->n_shots, fa->n_fires);
-		}
+	fa->n_fires = fa->n_shots - fa_readl(fa, fa->fa_adc_csr_base,
+					     &zfad_regs[ZFAT_SHOTS_REM]);
+
+	if (fa->n_fires != fa->n_shots) {
+		dev_err(&fa->fmc->dev,
+			"Expected %i trigger fires, but %i occurs\n",
+			fa->n_shots, fa->n_fires);
 	}
 }