From: Sergei Shtylylov au_readl() does needed byteswapping, etc. Cc: Greg KH Cc: Takashi Iwai Cc: Jaroslav Kysela Acked-by: Jordan Crouse Signed-off-by: Andrew Morton --- drivers/usb/host/ohci-au1xxx.c | 2 +- sound/oss/au1550_ac97.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff -puN drivers/usb/host/ohci-au1xxx.c~au1xx0-replace-casual-readl-with-au_readl-in-the-drivers drivers/usb/host/ohci-au1xxx.c --- devel/drivers/usb/host/ohci-au1xxx.c~au1xx0-replace-casual-readl-with-au_readl-in-the-drivers 2006-01-05 22:49:34.000000000 -0800 +++ devel-akpm/drivers/usb/host/ohci-au1xxx.c 2006-01-05 22:49:34.000000000 -0800 @@ -66,7 +66,7 @@ static void au1xxx_stop_hc(struct platfo ": 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); } diff -puN sound/oss/au1550_ac97.c~au1xx0-replace-casual-readl-with-au_readl-in-the-drivers sound/oss/au1550_ac97.c --- devel/sound/oss/au1550_ac97.c~au1xx0-replace-casual-readl-with-au_readl-in-the-drivers 2006-01-05 22:49:34.000000000 -0800 +++ devel-akpm/sound/oss/au1550_ac97.c 2006-01-05 22:49:34.000000000 -0800 @@ -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); _