diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-27 16:35:40 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-11-29 12:28:16 -0500 |
commit | 9b8f5695a155308a4e0355a29747961bec9757c0 (patch) | |
tree | c02f918d7974d61dc64bd02d47c023a388195a1e /sound | |
parent | 4cdf5e49ce8ff79038ee5388cc5f97097238bb29 (diff) |
ASoC: Fix __iomem annotation for IDMA registers
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>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/samsung/i2s.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/idma.c | 2 | ||||
-rw-r--r-- | sound/soc/samsung/idma.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index fb80f2886c70..5de500ce5dd4 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c | |||
@@ -881,7 +881,7 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) | |||
881 | writel(CON_RSTCLR, i2s->addr + I2SCON); | 881 | writel(CON_RSTCLR, i2s->addr + I2SCON); |
882 | 882 | ||
883 | if (i2s->quirks & QUIRK_SEC_DAI) | 883 | if (i2s->quirks & QUIRK_SEC_DAI) |
884 | idma_reg_addr_init((void *)i2s->addr, | 884 | idma_reg_addr_init(i2s->addr, |
885 | i2s->sec_dai->idma_playback.dma_addr); | 885 | i2s->sec_dai->idma_playback.dma_addr); |
886 | 886 | ||
887 | probe_exit: | 887 | probe_exit: |
diff --git a/sound/soc/samsung/idma.c b/sound/soc/samsung/idma.c index 6ca3d8c221a0..baf97ebadd48 100644 --- a/sound/soc/samsung/idma.c +++ b/sound/soc/samsung/idma.c | |||
@@ -403,7 +403,7 @@ static int idma_new(struct snd_soc_pcm_runtime *rtd) | |||
403 | return ret; | 403 | return ret; |
404 | } | 404 | } |
405 | 405 | ||
406 | void idma_reg_addr_init(void *regs, dma_addr_t addr) | 406 | void idma_reg_addr_init(void __iomem *regs, dma_addr_t addr) |
407 | { | 407 | { |
408 | spin_lock_init(&idma.lock); | 408 | spin_lock_init(&idma.lock); |
409 | idma.regs = regs; | 409 | idma.regs = regs; |
diff --git a/sound/soc/samsung/idma.h b/sound/soc/samsung/idma.h index 48273216166e..8644946973e5 100644 --- a/sound/soc/samsung/idma.h +++ b/sound/soc/samsung/idma.h | |||
@@ -14,7 +14,7 @@ | |||
14 | #ifndef __SND_SOC_SAMSUNG_IDMA_H_ | 14 | #ifndef __SND_SOC_SAMSUNG_IDMA_H_ |
15 | #define __SND_SOC_SAMSUNG_IDMA_H_ | 15 | #define __SND_SOC_SAMSUNG_IDMA_H_ |
16 | 16 | ||
17 | extern void idma_reg_addr_init(void *regs, dma_addr_t addr); | 17 | extern void idma_reg_addr_init(void __iomem *regs, dma_addr_t addr); |
18 | 18 | ||
19 | /* dma_state */ | 19 | /* dma_state */ |
20 | #define LPAM_DMA_STOP 0 | 20 | #define LPAM_DMA_STOP 0 |