Skip to content

F
FMC ADC 100M 14b 4cha - Software
Commit 18f2d110 authored by Alessandro Rubini's avatar Alessandro Rubini
Browse files
Options

kernel: remove all warnings 

Signed-off-by: Alessandro Rubini's avatarAlessandro Rubini <rubini@gnudd.com>
parent f22fa87d
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
kernel/fa-dma.c
View file @ 18f2d110
......@@ -129,10 +129,9 @@ int zfad_map_dma(struct zio_cset *cset, struct zfad_block *zfad_block,
unsigned int n_blocks)
{
struct fa_dev *fa = cset->zdev->priv_d;
struct zio_block *block = zfad_block->block;
struct scatterlist *sg;
struct dma_item *items;
uint32_t dev_mem_ptr;
uint32_t dev_mem_ptr = 0;
unsigned int i, pages, sglen, size, i_blk;
dma_addr_t tmp;
int err;
......@@ -202,7 +201,7 @@ int zfad_map_dma(struct zio_cset *cset, struct zfad_block *zfad_block,
/* Prepare DMA item */
items[i].start_addr = dev_mem_ptr;
items[i].dma_addr_l = sg_dma_address(sg) & 0xFFFFFFFF;
items[i].dma_addr_h = sg_dma_address(sg) >> 32;
items[i].dma_addr_h = (uint64_t)sg_dma_address(sg) >> 32;
items[i].dma_len = sg_dma_len(sg);
dev_mem_ptr += items[i].dma_len;
if (!sg_is_last(sg)) {/* more transfers */
......
kernel/fa-zio-drv.c
View file @ 18f2d110
......@@ -119,7 +119,7 @@ static struct zio_attribute zfad_cset_ext_zattr[] = {
};
/* FIXME Unused until TLV control will be available */
#if 0 /* FIXME Unused until TLV control will be available */
static ZIO_ATTR_DEFINE_STD(ZIO_DEV, zfad_chan_std_zattr) = {
/* the offset is complement 2 format */
ZIO_ATTR(zdev, ZIO_ATTR_OFFSET, ZIO_RW_PERM, ZFA_CHx_OFFSET, 0),
......@@ -132,6 +132,7 @@ static ZIO_ATTR_DEFINE_STD(ZIO_DEV, zfad_chan_std_zattr) = {
*/
ZIO_ATTR(zdev, ZIO_ATTR_VREFTYPE, ZIO_RW_PERM, ZFA_CHx_CTL_RANGE, 0x11),
};
#endif
static struct zio_attribute zfad_chan_ext_zattr[] = {
/*ZIO_ATTR(zdev, "50ohm-termination", ZIO_RW_PERM, ZFA_CHx_CTL_TERM, 0x11),*/
......
kernel/fa-zio-trg.c
View file @ 18f2d110
......@@ -219,7 +219,7 @@ static void zfat_change_status(struct zio_ti *ti, unsigned int status)
* occurs before the natural end of the acquisition, un-filled block
* are not stored.
*/
static int zfat_data_done(struct zio_cset *cset)
static void zfat_data_done(struct zio_cset *cset)
{
struct zfad_block *zfad_block = cset->interleave->priv_d;
struct zio_bi *bi = cset->interleave->bi;
......@@ -230,7 +230,7 @@ static int zfat_data_done(struct zio_cset *cset)
/* Nothing to store */
if (!zfad_block)
return 0;
return;
/* Store blocks */
for(i = 0; i < fa->n_shots; ++i)
......@@ -250,7 +250,7 @@ static int zfat_data_done(struct zio_cset *cset)
kfree(zfad_block);
cset->interleave->priv_d = NULL;
return 0;
return;
}
/*
......
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