[PATCH] iomem annotations (sound/arm/aaci)

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 08cc3ddca96fb385d1a23db07b32ae3a5fe9fc2b..98877030d579fa6f641dee8dca596241940f32e6 100644 (file)
--- 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 d752e64268940efe5dba7d192b4953bc8716a048..b2f969bc7845e66b903c48f07e16c21fbc214629 100644 (file)
--- 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 */