Skip to content

Commit

Permalink
ASoC: Fix __iomem annotation for IDMA registers
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Mark Brown committed Nov 29, 2011
1 parent 4cdf5e4 commit 9b8f569
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion sound/soc/samsung/i2s.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/samsung/idma.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion sound/soc/samsung/idma.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9b8f569

Please sign in to comment.