Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
F
FMC ADC 100M 14b 4cha - Software
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
image/svg+xml
Discourse
Discourse
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Projects
FMC ADC 100M 14b 4cha - Software
Commits
9389ab19
Commit
9389ab19
authored
May 16, 2017
by
Federico Vaga
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kernel: remove 'un-used' function
Signed-off-by:
Federico Vaga
<
federico.vaga@cern.ch
>
parent
787ab2f7
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
32 deletions
+14
-32
fa-irq.c
kernel/fa-irq.c
+14
-31
fmc-adc-100m14b4cha.h
kernel/fmc-adc-100m14b4cha.h
+0
-1
No files found.
kernel/fa-irq.c
View file @
9389ab19
...
...
@@ -186,36 +186,6 @@ void zfad_dma_error(struct zio_cset *cset)
"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
...
...
@@ -235,7 +205,20 @@ static void fa_irq_work(struct work_struct *work)
struct
zio_cset
*
cset
=
fa
->
zdev
->
cset
;
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
);
if
(
!
res
)
{
/*
...
...
kernel/fmc-adc-100m14b4cha.h
View file @
9389ab19
...
...
@@ -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_error
(
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_free_irqs
(
struct
fa_dev
*
fa
);
extern
int
fa_enable_irqs
(
struct
fa_dev
*
fa
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment