Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit 9389ab19 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

kernel: remove 'un-used' function 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 787ab2f7
Hide whitespace changes
Inline Side-by-side
Showing with 14 additions and 32 deletions
kernel/fa-irq.c
View file @ 9389ab19
...@@ -186,36 +186,6 @@ void zfad_dma_error(struct zio_cset *cset) ...@@ -186,36 +186,6 @@ void zfad_dma_error(struct zio_cset *cset)
"DMA error occurs but no block was acquired\n"); "DMA error occurs but no block was acquired\n");
} }
/*
* zfat_irq_acq_end
* @fa: fmc-adc descriptor
*
* The ADC end the acquisition, so, if the state machine is idle, we can
* retrieve data from the ADC DDR memory.
*/
void zfat_irq_acq_end(struct zio_cset *cset)
{
struct fa_dev *fa = cset->zdev->priv_d;
dev_dbg(fa->msgdev, "Acquisition done\n");
/*
* because the driver doesn't listen anymore trig-event
* we agreed that the HW will provide a dedicated register
* to check the real number of shots in order to compare it
* with the requested one.
* 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.
*/
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->msgdev,
"Expected %i trigger fires, but %i occurs\n",
fa->n_shots, fa->n_fires);
}
}
/* /*
* job executed within a work thread * job executed within a work thread
...@@ -235,7 +205,20 @@ static void fa_irq_work(struct work_struct *work) ...@@ -235,7 +205,20 @@ static void fa_irq_work(struct work_struct *work)
struct zio_cset *cset = fa->zdev->cset; struct zio_cset *cset = fa->zdev->cset;
int res; int res;
zfat_irq_acq_end(cset); /*
* This 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.
*/
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->msgdev,
"Expected %i trigger fires, but %i occurs\n",
fa->n_shots, fa->n_fires);
}
res = zfad_dma_start(cset); res = zfad_dma_start(cset);
if (!res) { if (!res) {
/* /*
......
kernel/fmc-adc-100m14b4cha.h
View file @ 9389ab19
...@@ -610,7 +610,6 @@ extern int zfad_dma_start(struct zio_cset *cset); ...@@ -610,7 +610,6 @@ extern int zfad_dma_start(struct zio_cset *cset);
extern void zfad_dma_done(struct zio_cset *cset); extern void zfad_dma_done(struct zio_cset *cset);
extern void zfad_dma_error(struct zio_cset *cset); extern void zfad_dma_error(struct zio_cset *cset);
extern void zfat_irq_trg_fire(struct zio_cset *cset); extern void zfat_irq_trg_fire(struct zio_cset *cset);
extern void zfat_irq_acq_end(struct zio_cset *cset);
extern int fa_setup_irqs(struct fa_dev *fa); extern int fa_setup_irqs(struct fa_dev *fa);
extern int fa_free_irqs(struct fa_dev *fa); extern int fa_free_irqs(struct fa_dev *fa);
extern int fa_enable_irqs(struct fa_dev *fa); extern int fa_enable_irqs(struct fa_dev *fa);
......
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