Skip to content

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

sw:drv cppcheck fixes 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent e03fafa5
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 28 deletions
software/kernel/fa-calibration.c
View file @ cc7fe630
......@@ -349,9 +349,11 @@ static int fa_verify_calib_stanza(struct device *msgdev, char *name, int r,
static int fa_verify_calib(struct device *msgdev, struct fa_calib *calib)
{
int i, err = 0;
int i;
for (i = 0; i < ARRAY_SIZE(calib->adc); i++) {
int err;
err = fa_verify_calib_stanza(msgdev, "adc", i, calib->adc + i);
if (err)
return err;
......
software/kernel/fa-core.c
View file @ cc7fe630
......@@ -369,7 +369,6 @@ int fa_adc_data_pattern_get(struct fa_dev *fa, uint16_t *pattern,
int zfad_fsm_command(struct fa_dev *fa, uint32_t command)
{
struct zio_cset *cset = fa->zdev->cset;
uint32_t val;
if (command != FA100M14B4C_CMD_START &&
command != FA100M14B4C_CMD_STOP) {
......@@ -401,8 +400,8 @@ int zfad_fsm_command(struct fa_dev *fa, uint32_t command)
/* If START, check if we can start */
if (command == FA100M14B4C_CMD_START) {
/* Verify that SerDes PLL is lockes */
val = fa_readl(fa, fa->fa_adc_csr_base,
&zfad_regs[ZFA_STA_SERDES_PLL]);
uint32_t val = fa_readl(fa, fa->fa_adc_csr_base,
&zfad_regs[ZFA_STA_SERDES_PLL]);
if (!val) {
dev_info(fa->msgdev, "Cannot start acquisition: "
"SerDes PLL not locked\n");
......@@ -465,7 +464,7 @@ static void fa_init_timetag(struct fa_dev *fa)
static int __fa_init(struct fa_dev *fa)
{
struct zio_device *zdev = fa->zdev;
int i, addr;
int i;
/* Use identity calibration */
fa->mshot_max_samples = fa_readl(fa, fa->fa_adc_csr_base,
......@@ -476,8 +475,8 @@ static int __fa_init(struct fa_dev *fa)
FA100M14B4C_CMD_STOP);
/* Initialize channels to use 1V range */
for (i = 0; i < 4; ++i) {
addr = zfad_get_chx_index(ZFA_CHx_CTL_RANGE,
zdev->cset->chan[i].index);
int addr = zfad_get_chx_index(ZFA_CHx_CTL_RANGE,
zdev->cset->chan[i].index);
fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[addr],
FA100M14B4C_RANGE_1V);
fa_adc_range_set(fa, &zdev->cset->chan[i],
......@@ -735,7 +734,6 @@ out_fmc:
int fa_remove(struct platform_device *pdev)
{
struct fa_dev *fa = platform_get_drvdata(pdev);
struct fa_modlist *m;
int i = ARRAY_SIZE(mods);
if (WARN(!fa, "asked to remove fmc-adc-100m device but it does not exists\n"))
......@@ -745,7 +743,7 @@ int fa_remove(struct platform_device *pdev)
flush_workqueue(fa_workqueue);
while (--i >= 0) {
m = mods + i;
struct fa_modlist *m = mods + i;
if (m->exit)
m->exit(fa);
}
......
software/kernel/fa-debug.c
View file @ cc7fe630
......@@ -135,12 +135,13 @@ static const struct debugfs_reg32 fa_debugfs_reg32[] = {
static void fa_regdump_seq_read_spi(struct fa_dev *fa, struct seq_file *s)
{
int i, err;
int i;
seq_printf(s, "ADC SPI registers\n");
seq_printf(s, "Address Data\n");
for (i = 0; i < 5; ++i) {
uint32_t tx, rx;
int err;
tx = 0x8000 | (i << 8);
err = fa_spi_xfer(fa, FA_SPI_SS_ADC, 16, tx, &rx);
......@@ -259,7 +260,7 @@ static ssize_t fa_data_pattern_read(struct file *file, char __user *buf,
err = fa_adc_data_pattern_get(fa, &pattern, &enable);
if (err)
return err;
snprintf(buf_l, FA_ADC_DATA_PATTERN_CMD_SIZE, "adc %d 0x%02x\n",
snprintf(buf_l, FA_ADC_DATA_PATTERN_CMD_SIZE, "adc %u 0x%02x\n",
enable, pattern);
count = min(count, strlen(buf_l));
err = copy_to_user(buf, buf_l, count);
......
software/kernel/fa-dma.c
View file @ cc7fe630
......@@ -40,18 +40,16 @@ static int __get_endian(void)
*/
static void __endianness(unsigned int byte_length, void *buffer)
{
int i, size;
uint32_t *ptr;
/* CPU may be little endian, VME is big endian */
if (__get_endian() == LITTLE_ENDIAN) {
ptr = buffer;
/* swap samples and trig timetag all seen as 32bits words */
size = byte_length/4;
int i;
int size = byte_length / 4;
uint32_t *ptr = buffer;
for (i = 0; i < size; ++i, ++ptr)
*ptr = __be32_to_cpu(*ptr);
}
}
struct zfad_timetag {
......@@ -460,7 +458,8 @@ static int zfad_dma_prep_slave_sg(struct dma_chan *dchan,
struct fa_dev *fa = cset->zdev->priv_d;
struct dma_async_tx_descriptor *tx;
struct page **pages;
unsigned int nr_pages, sg_mapped;
unsigned int nr_pages;
int sg_mapped;
size_t max_segment_size;
int err;
......
software/kernel/fa-irq.c
View file @ cc7fe630
......@@ -56,8 +56,6 @@ irqreturn_t fa_irq_handler(int irq, void *arg)
struct fa_dev *fa = arg;
struct zio_cset *cset = fa->zdev->cset;
uint32_t status;
unsigned long flags;
struct zfad_block *zfad_block;
/* irq to handle */
fa_get_irq_status(fa, &status);
......@@ -65,6 +63,9 @@ irqreturn_t fa_irq_handler(int irq, void *arg)
return IRQ_NONE; /* No interrupt fired by this mezzanine */
if (status & FA_IRQ_ADC_ACQ_END) {
struct zfad_block *zfad_block;
unsigned long flags;
dev_dbg(fa->msgdev, "Handle ADC interrupts\n");
/*
......@@ -152,8 +153,3 @@ int fa_disable_irqs(struct fa_dev *fa)
return 0;
}
int fa_ack_irq(struct fa_dev *fa, int irq_id)
{
return 0;
}
software/kernel/fmc-adc-100m14b4cha.h
View file @ cc7fe630
......@@ -572,12 +572,11 @@ static inline void fa_writel(struct fa_dev *fa,
const struct zfa_field_desc *field,
uint32_t usr_val)
{
uint32_t cur, val;
uint32_t val = usr_val;
val = usr_val;
/* Read current register value first if it's a bitfield */
if (field->is_bitfield) {
cur = fa_ioread(fa, base_off+field->offset);
uint32_t cur = fa_ioread(fa, base_off+field->offset);
/* */
cur &= ~field->mask; /* clear bits according to the mask */
val = usr_val * (field->mask & -(field->mask));
......
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