Skip to content

F
FMC TDC 1ns 5cha - Software
Commit 79351981 authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

kernel: remove useless return status 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent 9026e588
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 10 deletions
kernel/ft-irq.c
View file @ 79351981
......@@ -50,9 +50,9 @@ static void copy_timestamps(struct fmctdc_dev *ft, int base_addr,
}
static int ft_read_sw_fifo(struct fmctdc_dev *ft, int channel,
struct zio_channel *chan,
struct ft_wr_timestamp *wrts)
static void ft_read_sw_fifo(struct fmctdc_dev *ft, int channel,
struct zio_channel *chan,
struct ft_wr_timestamp *wrts)
{
struct zio_control *ctrl;
struct zio_ti *ti = chan->cset->ti;
......@@ -111,8 +111,6 @@ static int ft_read_sw_fifo(struct fmctdc_dev *ft, int channel,
v[FT_ATTR_DEV_SEQUENCE] = ts.gseq_id;
v[FT_ATTR_TDC_ZERO_OFFSET] = ft->calib.zero_offset[channel - 1];
v[FT_ATTR_TDC_USER_OFFSET] = st->user_offset;
return 0;
}
......@@ -275,7 +273,7 @@ static void ft_readout_tasklet(unsigned long arg)
struct ft_wr_timestamp wrts;
struct zio_cset *cset;
uint32_t rd_ptr;
int count, dacapo, err, ret;
int count, dacapo, ret;
ft->prev_wr_ptr = ft->cur_wr_ptr;
ft->cur_wr_ptr = ft_readl(ft, TDC_REG_BUFFER_PTR);
......@@ -311,10 +309,9 @@ static void ft_readout_tasklet(unsigned long arg)
if (ZIO_TI_ARMED & cset->ti->flags) {
/* there is an active block, try reading an
accumulated sample */
err = ft_read_sw_fifo(ft, wrts.channel - 1,
cset->chan, &wrts);
if (!err)
zio_trigger_data_done(cset);
ft_read_sw_fifo(ft, wrts.channel - 1,
cset->chan, &wrts);
zio_trigger_data_done(cset);
}
}
}
......
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