diff options
author | viro@ZenIV.linux.org.uk <viro@ZenIV.linux.org.uk> | 2005-09-05 21:06:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:17:33 -0400 |
commit | e12ba644eefa9b8df4f961be91f1a0c5ea5038fa (patch) | |
tree | 02a2acb3eccf0a4f98cbf5f0cac523856fc4c078 | |
parent | 90dffc03ca8caa0ea047f11c81fe61cd86d80568 (diff) |
[PATCH] iomem annotations (sound/arm/aaci)
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | sound/arm/aaci.c | 4 | ||||
-rw-r--r-- | sound/arm/aaci.h | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c index 08cc3ddca96f..98877030d579 100644 --- a/sound/arm/aaci.c +++ b/sound/arm/aaci.c | |||
@@ -821,7 +821,7 @@ static int __devinit aaci_init_pcm(struct aaci *aaci) | |||
821 | 821 | ||
822 | static unsigned int __devinit aaci_size_fifo(struct aaci *aaci) | 822 | static unsigned int __devinit aaci_size_fifo(struct aaci *aaci) |
823 | { | 823 | { |
824 | void *base = aaci->base + AACI_CSCH1; | 824 | void __iomem *base = aaci->base + AACI_CSCH1; |
825 | int i; | 825 | int i; |
826 | 826 | ||
827 | writel(TXCR_FEN | TXCR_TSZ16 | TXCR_TXEN, base + AACI_TXCR); | 827 | 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) | |||
877 | aaci->playback.fifo = aaci->base + AACI_DR1; | 877 | aaci->playback.fifo = aaci->base + AACI_DR1; |
878 | 878 | ||
879 | for (i = 0; i < 4; i++) { | 879 | for (i = 0; i < 4; i++) { |
880 | void *base = aaci->base + i * 0x14; | 880 | void __iomem *base = aaci->base + i * 0x14; |
881 | 881 | ||
882 | writel(0, base + AACI_IE); | 882 | writel(0, base + AACI_IE); |
883 | writel(0, base + AACI_TXCR); | 883 | writel(0, base + AACI_TXCR); |
diff --git a/sound/arm/aaci.h b/sound/arm/aaci.h index d752e6426894..b2f969bc7845 100644 --- a/sound/arm/aaci.h +++ b/sound/arm/aaci.h | |||
@@ -200,8 +200,8 @@ | |||
200 | 200 | ||
201 | 201 | ||
202 | struct aaci_runtime { | 202 | struct aaci_runtime { |
203 | void *base; | 203 | void __iomem *base; |
204 | void *fifo; | 204 | void __iomem *fifo; |
205 | 205 | ||
206 | struct ac97_pcm *pcm; | 206 | struct ac97_pcm *pcm; |
207 | int pcm_open; | 207 | int pcm_open; |
@@ -223,7 +223,7 @@ struct aaci_runtime { | |||
223 | struct aaci { | 223 | struct aaci { |
224 | struct amba_device *dev; | 224 | struct amba_device *dev; |
225 | snd_card_t *card; | 225 | snd_card_t *card; |
226 | void *base; | 226 | void __iomem *base; |
227 | unsigned int fifosize; | 227 | unsigned int fifosize; |
228 | 228 | ||
229 | /* AC'97 */ | 229 | /* AC'97 */ |