From: viro@ZenIV.linux.org.uk Date: Tue, 6 Sep 2005 01:06:57 +0000 (+0100) Subject: [PATCH] iomem annotations (sound/arm/aaci) X-Git-Tag: v2.6.14-rc1~540 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=e12ba644eefa9b8df4f961be91f1a0c5ea5038fa;p=safe%2Fjmp%2Flinux-2.6 [PATCH] iomem annotations (sound/arm/aaci) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds --- diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 08cc3dd..9887703 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c @@ -821,7 +821,7 @@ static int __devinit aaci_init_pcm(struct aaci *aaci) static unsigned int __devinit aaci_size_fifo(struct aaci *aaci) { - void *base = aaci->base + AACI_CSCH1; + void __iomem *base = aaci->base + AACI_CSCH1; int i; writel(TXCR_FEN | TXCR_TSZ16 | TXCR_TXEN, base + AACI_TXCR); @@ -877,7 +877,7 @@ static int __devinit aaci_probe(struct amba_device *dev, void *id) aaci->playback.fifo = aaci->base + AACI_DR1; for (i = 0; i < 4; i++) { - void *base = aaci->base + i * 0x14; + void __iomem *base = aaci->base + i * 0x14; writel(0, base + AACI_IE); writel(0, base + AACI_TXCR); diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h index d752e64..b2f969b 100644 --- a/sound/arm/aaci.h +++ b/sound/arm/aaci.h @@ -200,8 +200,8 @@ struct aaci_runtime { - void *base; - void *fifo; + void __iomem *base; + void __iomem *fifo; struct ac97_pcm *pcm; int pcm_open; @@ -223,7 +223,7 @@ struct aaci_runtime { struct aaci { struct amba_device *dev; snd_card_t *card; - void *base; + void __iomem *base; unsigned int fifosize; /* AC'97 */