]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ASoC: rsnd: Silence DMA slave ID compile warning on 64-bit
authorGeert Uytterhoeven <geert+renesas@glider.be>
Tue, 11 Aug 2015 12:47:18 +0000 (14:47 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 11 Aug 2015 16:13:25 +0000 (17:13 +0100)
On arm64:

    sound/soc/sh/rcar/dma.c: In function 'rsnd_dmaen_init':
    sound/soc/sh/rcar/dma.c:180:9: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]
     (void *)id);
     ^
    include/linux/dmaengine.h:1185:75: note: in definition of macro 'dma_request_channel'
     #define dma_request_channel(mask, x, y) __dma_request_channel(&(mask), x, y)
       ^

Add an intermediate cast to "uintptr_t" to kill the compile warning.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/sh/rcar/dma.c

index 305b129298538850c0fbd8b217ef473b56a2fb0a..bfbb8a5e93bdce6c5c70092565869bf446233416 100644 (file)
@@ -177,7 +177,7 @@ static int rsnd_dmaen_init(struct rsnd_dai_stream *io,
                dma_cap_set(DMA_SLAVE, mask);
 
                dmaen->chan = dma_request_channel(mask, shdma_chan_filter,
-                                                 (void *)id);
+                                                 (void *)(uintptr_t)id);
        }
        if (IS_ERR_OR_NULL(dmaen->chan)) {
                dmaen->chan = NULL;