Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e12ba644 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

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



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 90dffc03

sound/arm/aaci.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

sound/arm/aaci.h

+3 −3
Original line number Diff line number Diff line
@@ -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 */