]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: Fix __iomem annotation for IDMA registers
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Sun, 27 Nov 2011 21:35:40 +0000 (21:35 +0000)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Tue, 29 Nov 2011 17:28:16 +0000 (17:28 +0000)
We always store the register address as __iomem but pass it around as a
plain void * which upsets sparse.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/samsung/i2s.c
sound/soc/samsung/idma.c
sound/soc/samsung/idma.h

index fb80f2886c708b6ce4b5d3f8d96fcebdfbf83188..5de500ce5dd400f42e82737873cc6feda9844bf9 100644 (file)
@@ -881,7 +881,7 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
                writel(CON_RSTCLR, i2s->addr + I2SCON);
 
        if (i2s->quirks & QUIRK_SEC_DAI)
-               idma_reg_addr_init((void *)i2s->addr,
+               idma_reg_addr_init(i2s->addr,
                                        i2s->sec_dai->idma_playback.dma_addr);
 
 probe_exit:
index 6ca3d8c221a0efe67a221f5553b9195974b18e2e..baf97ebadd48a3bde8156b70b3674832090e4cff 100644 (file)
@@ -403,7 +403,7 @@ static int idma_new(struct snd_soc_pcm_runtime *rtd)
        return ret;
 }
 
-void idma_reg_addr_init(void *regs, dma_addr_t addr)
+void idma_reg_addr_init(void __iomem *regs, dma_addr_t addr)
 {
        spin_lock_init(&idma.lock);
        idma.regs = regs;
index 48273216166e42dcd653f02c03f282290e875b4a..8644946973e57a0168c9bd2ce9491c82660ffa6e 100644 (file)
@@ -14,7 +14,7 @@
 #ifndef __SND_SOC_SAMSUNG_IDMA_H_
 #define __SND_SOC_SAMSUNG_IDMA_H_
 
-extern void idma_reg_addr_init(void *regs, dma_addr_t addr);
+extern void idma_reg_addr_init(void __iomem *regs, dma_addr_t addr);
 
 /* dma_state */
 #define LPAM_DMA_STOP  0