]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
dmaengine: mv_xor: make the code 64 bits compliant
authorGregory CLEMENT <gregory.clement@free-electrons.com>
Fri, 29 Apr 2016 07:49:05 +0000 (09:49 +0200)
committerVinod Koul <vinod.koul@intel.com>
Tue, 3 May 2016 06:57:47 +0000 (12:27 +0530)
Fix two warnings which appear when building for 64 bits target:

drivers/dma/mv_xor.c: In function ‘mv_xor_prep_dma_xor’:
drivers/dma/mv_xor.c:480:3: warning: format ‘%u’ expects argument of type ‘unsigned int’, but argument 6 has type ‘size_t {aka long unsigned int}’ [-Wformat=]
   "%s src_cnt: %d len: %u dest %pad flags: %ld\n",
   ^
drivers/dma/mv_xor.c: In function ‘mv_xor_probe’:
drivers/dma/mv_xor.c:1223:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast]
    op_in_desc = (int)of_id->data;
                 ^

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Vinod Koul <vinod.koul@intel.com>
drivers/dma/mv_xor.c

index 3922a5d5680604f831308dc02a50b93685a089ce..a6ec82776cbcc4226a59d94f2ae0954e57369d5f 100644 (file)
@@ -477,7 +477,7 @@ mv_xor_prep_dma_xor(struct dma_chan *chan, dma_addr_t dest, dma_addr_t *src,
        BUG_ON(len > MV_XOR_MAX_BYTE_COUNT);
 
        dev_dbg(mv_chan_to_devp(mv_chan),
-               "%s src_cnt: %d len: %u dest %pad flags: %ld\n",
+               "%s src_cnt: %d len: %zu dest %pad flags: %ld\n",
                __func__, src_cnt, len, &dest, flags);
 
        sw_desc = mv_chan_alloc_slot(mv_chan);
@@ -1220,7 +1220,7 @@ static int mv_xor_probe(struct platform_device *pdev)
                        struct mv_xor_chan *chan;
                        dma_cap_mask_t cap_mask;
                        int irq;
-                       op_in_desc = (int)of_id->data;
+                       op_in_desc = (uintptr_t)of_id->data;
 
                        if (i >= max_channels)
                                continue;