Skip to content

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

kernel: checkpatch fixes 

Signed-off-by: Federico Vaga's avatarFederico Vaga <federico.vaga@cern.ch>
parent b041c02f
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 11 deletions
kernel/fa-core.c
View file @ 1a542d73
...@@ -161,7 +161,7 @@ int zfad_set_range(struct fa_dev *fa, struct zio_channel *chan, ...@@ -161,7 +161,7 @@ int zfad_set_range(struct fa_dev *fa, struct zio_channel *chan,
i = zfad_get_chx_index(ZFA_CHx_OFFSET, chan); i = zfad_get_chx_index(ZFA_CHx_OFFSET, chan);
fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[i], fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[i],
offset & 0xffff /* prevent warning */ ); offset & 0xffff /* prevent warning */);
i = zfad_get_chx_index(ZFA_CHx_GAIN, chan); i = zfad_get_chx_index(ZFA_CHx_GAIN, chan);
fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[i], gain); fa_writel(fa, fa->fa_adc_csr_base, &zfad_regs[i], gain);
...@@ -517,7 +517,8 @@ static int fa_init(void) ...@@ -517,7 +517,8 @@ static int fa_init(void)
int ret; int ret;
fa_workqueue = alloc_workqueue(fa_dev_drv.driver.name, fa_workqueue = alloc_workqueue(fa_dev_drv.driver.name,
WQ_NON_REENTRANT | WQ_UNBOUND | WQ_MEM_RECLAIM, 1); WQ_NON_REENTRANT | WQ_UNBOUND |
WQ_MEM_RECLAIM, 1);
if (fa_workqueue == NULL) if (fa_workqueue == NULL)
return -ENOMEM; return -ENOMEM;
......
kernel/fa-spec-core.c
View file @ 1a542d73
...@@ -40,9 +40,9 @@ static int fa_spec_init(struct fa_dev *fa) ...@@ -40,9 +40,9 @@ static int fa_spec_init(struct fa_dev *fa)
fmc_find_sdb_device(fa->fmc->sdb, 0xce42, 0xd5735ab4, NULL); fmc_find_sdb_device(fa->fmc->sdb, 0xce42, 0xd5735ab4, NULL);
dev_info(msgdev, dev_info(msgdev,
"Spec Base addrs: irq_dmma:0x%x, dma_ctrl:0x%x, csr:0x%x \n", "Spec Base addrs: irq_dmma:0x%x, dma_ctrl:0x%x, csr:0x%x \n",
cdata->fa_irq_dma_base, cdata->fa_dma_base, cdata->fa_irq_dma_base, cdata->fa_dma_base,
fa->fa_carrier_csr_base); fa->fa_carrier_csr_base);
/* Wait 50ms, so device has time to calibrate */ /* Wait 50ms, so device has time to calibrate */
mdelay(50); mdelay(50);
...@@ -85,7 +85,7 @@ static int fa_spec_init(struct fa_dev *fa) ...@@ -85,7 +85,7 @@ static int fa_spec_init(struct fa_dev *fa)
static int fa_spec_reset(struct fa_dev *fa) static int fa_spec_reset(struct fa_dev *fa)
{ {
// struct spec_dev *spec = fa->fmc->carrier_data; /*struct spec_dev *spec = fa->fmc->carrier_data;*/
dev_info(&fa->fmc->dev, "%s: resetting TDC core through Gennum.\n", dev_info(&fa->fmc->dev, "%s: resetting TDC core through Gennum.\n",
__func__); __func__);
......
kernel/fa-spec-dma.c
View file @ 1a542d73
...@@ -204,7 +204,7 @@ static int zfad_map_dma(struct zio_cset *cset, struct zfad_block *zfad_block, ...@@ -204,7 +204,7 @@ static int zfad_map_dma(struct zio_cset *cset, struct zfad_block *zfad_block,
if (!sg_is_last(sg)) {/* more transfers */ if (!sg_is_last(sg)) {/* more transfers */
/* uint64_t so it works on 32 and 64 bit */ /* uint64_t so it works on 32 and 64 bit */
tmp = spec_data->dma_list_item; tmp = spec_data->dma_list_item;
tmp += (sizeof(struct fa_dma_item) * (i+ 1)); tmp += (sizeof(struct fa_dma_item) * (i + 1));
items[i].next_addr_l = ((uint64_t)tmp) & 0xFFFFFFFF; items[i].next_addr_l = ((uint64_t)tmp) & 0xFFFFFFFF;
items[i].next_addr_h = ((uint64_t)tmp) >> 32; items[i].next_addr_h = ((uint64_t)tmp) >> 32;
items[i].attribute = 0x1; /* more items */ items[i].attribute = 0x1; /* more items */
......
kernel/fa-svec-dma.c
View file @ 1a542d73
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
#define lower_32_bits(n) ((u32)(n)) #define lower_32_bits(n) ((u32)(n))
#endif /* lower_32_bits */ #endif /* lower_32_bits */
static void build_dma_desc(struct vme_dma* desc, unsigned long vme_addr, static void build_dma_desc(struct vme_dma *desc, unsigned long vme_addr,
void *addr_dest, ssize_t len) void *addr_dest, ssize_t len)
{ {
struct vme_dma_attr *vme; struct vme_dma_attr *vme;
...@@ -34,7 +34,7 @@ static void build_dma_desc(struct vme_dma* desc, unsigned long vme_addr, ...@@ -34,7 +34,7 @@ static void build_dma_desc(struct vme_dma* desc, unsigned long vme_addr,
vme->data_width = VME_D32; vme->data_width = VME_D32;
vme->am = VME_A24_USER_DATA_SCT; vme->am = VME_A24_USER_DATA_SCT;
// vme->am = VME_A24_USER_MBLT; /*vme->am = VME_A24_USER_MBLT;*/
vme->addru = upper_32_bits(vme_addr); vme->addru = upper_32_bits(vme_addr);
vme->addrl = lower_32_bits(vme_addr); vme->addrl = lower_32_bits(vme_addr);
...@@ -102,7 +102,7 @@ int fa_svec_dma_start(struct zio_cset *cset) ...@@ -102,7 +102,7 @@ int fa_svec_dma_start(struct zio_cset *cset)
&fa_svec_regfield[FA_DMA_DDR_ADDR], &fa_svec_regfield[FA_DMA_DDR_ADDR],
fa_dma_block[0].dev_mem_off/4); fa_dma_block[0].dev_mem_off/4);
/* Execute DMA shot by shot */ /* Execute DMA shot by shot */
for (i = 0; i<fa->n_shots; ++i) { for (i = 0; i < fa->n_shots; ++i) {
pr_debug("configure DMA descriptor shot %d " pr_debug("configure DMA descriptor shot %d "
"vme addr: 0x%llx destination address: 0x%p len: %d \n", "vme addr: 0x%llx destination address: 0x%p len: %d \n",
i, (long long)vme_addr, fa_dma_block[i].block->data, i, (long long)vme_addr, fa_dma_block[i].block->data,
...@@ -113,7 +113,8 @@ int fa_svec_dma_start(struct zio_cset *cset) ...@@ -113,7 +113,8 @@ int fa_svec_dma_start(struct zio_cset *cset)
if (vme_do_dma_kernel(&desc)) if (vme_do_dma_kernel(&desc))
return -1; return -1;
__endianness(fa_dma_block[i].block->datalen, fa_dma_block[i].block->data); __endianness(fa_dma_block[i].block->datalen,
fa_dma_block[i].block->data);
} }
return 0; return 0;
......
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