lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
viro@ZenIV.linux.org.uk
2005-09-06 02:06:57 +01:00
committed by Linus Torvalds
parent 90dffc03ca
commit e12ba644ee
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sound/arm/aaci.c
View File

@@ -821,7 +821,7 @@ static int __devinit aaci_init_pcm(struct aaci *aaci)
static unsigned int __devinit aaci_size_fifo(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; int i;
writel(TXCR_FEN | TXCR_TSZ16 | TXCR_TXEN, base + AACI_TXCR); 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; aaci->playback.fifo = aaci->base + AACI_DR1;
for (i = 0; i < 4; i++) { 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_IE);
writel(0, base + AACI_TXCR); writel(0, base + AACI_TXCR);

6
sound/arm/aaci.h
View File

@@ -200,8 +200,8 @@
struct aaci_runtime { struct aaci_runtime {
void *base; void __iomem *base;
void *fifo; void __iomem *fifo;
struct ac97_pcm *pcm; struct ac97_pcm *pcm;
int pcm_open; int pcm_open;
@@ -223,7 +223,7 @@ struct aaci_runtime {
struct aaci { struct aaci {
struct amba_device *dev; struct amba_device *dev;
snd_card_t *card; snd_card_t *card;
void *base; void __iomem *base;
unsigned int fifosize; unsigned int fifosize;
/* AC'97 */ /* AC'97 */