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

Commit 05090fc9 authored by Sergei Shtylylov's avatar Sergei Shtylylov Committed by Greg Kroah-Hartman
Browse files

[PATCH] USB: Au1xx0: replace casual readl() with au_readl() in the drivers 



au_readl() does needed byteswapping, etc.

Cc: Takashi Iwai <tiwai@suse.de>
Cc: Jaroslav Kysela <perex@perex.cz>
Acked-by: default avatarJordan Crouse <jordan.crouse@amd.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent de289fdf

drivers/usb/host/ohci-au1xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static void au1xxx_stop_hc(struct platform_device *dev) 
	       ": stopping Au1xxx OHCI USB Controller\n");



	/* Disable clock */

	au_writel(readl((void *)USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG);

	au_writel(au_readl(USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG);

}

sound/oss/au1550_ac97.c

+6 −6
Original line number Diff line number Diff line
@@ -462,7 +462,7 @@ stop_dac(struct au1550_state *s) 
	/* Wait for Transmit Busy to show disabled.

	*/

	do {

		stat = readl((void *)PSC_AC97STAT);

		stat = au_readl(PSC_AC97STAT);

		au_sync();

	} while ((stat & PSC_AC97STAT_TB) != 0);
@@ -491,7 +491,7 @@ stop_adc(struct au1550_state *s) 
	/* Wait for Receive Busy to show disabled.

	*/

	do {

		stat = readl((void *)PSC_AC97STAT);

		stat = au_readl(PSC_AC97STAT);

		au_sync();

	} while ((stat & PSC_AC97STAT_RB) != 0);
@@ -541,7 +541,7 @@ set_xmit_slots(int num_channels) 
	/* Wait for Device ready.

	*/

	do {

		stat = readl((void *)PSC_AC97STAT);

		stat = au_readl(PSC_AC97STAT);

		au_sync();

	} while ((stat & PSC_AC97STAT_DR) == 0);

}
@@ -573,7 +573,7 @@ set_recv_slots(int num_channels) 
	/* Wait for Device ready.

	*/

	do {

		stat = readl((void *)PSC_AC97STAT);

		stat = au_readl(PSC_AC97STAT);

		au_sync();

	} while ((stat & PSC_AC97STAT_DR) == 0);

}
@@ -1995,7 +1995,7 @@ au1550_probe(void) 
	/* Wait for PSC ready.

	*/

	do {

		val = readl((void *)PSC_AC97STAT);

		val = au_readl(PSC_AC97STAT);

		au_sync();

	} while ((val & PSC_AC97STAT_SR) == 0);
@@ -2018,7 +2018,7 @@ au1550_probe(void) 
	/* Wait for Device ready.

	*/

	do {

		val = readl((void *)PSC_AC97STAT);

		val = au_readl(PSC_AC97STAT);

		au_sync();

	} while ((val & PSC_AC97STAT_DR) == 0);