diff options
| author | Sergei Shtylylov <sshtylyov@ru.mvista.com> | 2006-01-06 01:50:39 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-31 20:23:43 -0500 |
| commit | 05090fc969be0bd1e01c3798b17fe7947fad0efa (patch) | |
| tree | 4b2bcf52ced7649545448be472bfeaa8d9647589 | |
| parent | de289fdf6f6c51b21c94283ffa219d31e583f327 (diff) | |
[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: Jordan Crouse <jordan.crouse@amd.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/usb/host/ohci-au1xxx.c | 2 | ||||
| -rw-r--r-- | sound/oss/au1550_ac97.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/drivers/usb/host/ohci-au1xxx.c b/drivers/usb/host/ohci-au1xxx.c index 77cd6ac07e3c..db280ca7b7a0 100644 --- a/drivers/usb/host/ohci-au1xxx.c +++ b/drivers/usb/host/ohci-au1xxx.c | |||
| @@ -67,7 +67,7 @@ static void au1xxx_stop_hc(struct platform_device *dev) | |||
| 67 | ": stopping Au1xxx OHCI USB Controller\n"); | 67 | ": stopping Au1xxx OHCI USB Controller\n"); |
| 68 | 68 | ||
| 69 | /* Disable clock */ | 69 | /* Disable clock */ |
| 70 | au_writel(readl((void *)USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG); | 70 | au_writel(au_readl(USB_HOST_CONFIG) & ~USBH_ENABLE_CE, USB_HOST_CONFIG); |
| 71 | } | 71 | } |
| 72 | 72 | ||
| 73 | 73 | ||
diff --git a/sound/oss/au1550_ac97.c b/sound/oss/au1550_ac97.c index b963c550dae6..bdee0502f3e2 100644 --- a/sound/oss/au1550_ac97.c +++ b/sound/oss/au1550_ac97.c | |||
| @@ -462,7 +462,7 @@ stop_dac(struct au1550_state *s) | |||
| 462 | /* Wait for Transmit Busy to show disabled. | 462 | /* Wait for Transmit Busy to show disabled. |
| 463 | */ | 463 | */ |
| 464 | do { | 464 | do { |
| 465 | stat = readl((void *)PSC_AC97STAT); | 465 | stat = au_readl(PSC_AC97STAT); |
| 466 | au_sync(); | 466 | au_sync(); |
| 467 | } while ((stat & PSC_AC97STAT_TB) != 0); | 467 | } while ((stat & PSC_AC97STAT_TB) != 0); |
| 468 | 468 | ||
| @@ -491,7 +491,7 @@ stop_adc(struct au1550_state *s) | |||
| 491 | /* Wait for Receive Busy to show disabled. | 491 | /* Wait for Receive Busy to show disabled. |
| 492 | */ | 492 | */ |
| 493 | do { | 493 | do { |
| 494 | stat = readl((void *)PSC_AC97STAT); | 494 | stat = au_readl(PSC_AC97STAT); |
| 495 | au_sync(); | 495 | au_sync(); |
| 496 | } while ((stat & PSC_AC97STAT_RB) != 0); | 496 | } while ((stat & PSC_AC97STAT_RB) != 0); |
| 497 | 497 | ||
| @@ -541,7 +541,7 @@ set_xmit_slots(int num_channels) | |||
| 541 | /* Wait for Device ready. | 541 | /* Wait for Device ready. |
| 542 | */ | 542 | */ |
| 543 | do { | 543 | do { |
| 544 | stat = readl((void *)PSC_AC97STAT); | 544 | stat = au_readl(PSC_AC97STAT); |
| 545 | au_sync(); | 545 | au_sync(); |
| 546 | } while ((stat & PSC_AC97STAT_DR) == 0); | 546 | } while ((stat & PSC_AC97STAT_DR) == 0); |
| 547 | } | 547 | } |
| @@ -573,7 +573,7 @@ set_recv_slots(int num_channels) | |||
| 573 | /* Wait for Device ready. | 573 | /* Wait for Device ready. |
| 574 | */ | 574 | */ |
| 575 | do { | 575 | do { |
| 576 | stat = readl((void *)PSC_AC97STAT); | 576 | stat = au_readl(PSC_AC97STAT); |
| 577 | au_sync(); | 577 | au_sync(); |
| 578 | } while ((stat & PSC_AC97STAT_DR) == 0); | 578 | } while ((stat & PSC_AC97STAT_DR) == 0); |
| 579 | } | 579 | } |
| @@ -1995,7 +1995,7 @@ au1550_probe(void) | |||
| 1995 | /* Wait for PSC ready. | 1995 | /* Wait for PSC ready. |
| 1996 | */ | 1996 | */ |
| 1997 | do { | 1997 | do { |
| 1998 | val = readl((void *)PSC_AC97STAT); | 1998 | val = au_readl(PSC_AC97STAT); |
| 1999 | au_sync(); | 1999 | au_sync(); |
| 2000 | } while ((val & PSC_AC97STAT_SR) == 0); | 2000 | } while ((val & PSC_AC97STAT_SR) == 0); |
| 2001 | 2001 | ||
| @@ -2018,7 +2018,7 @@ au1550_probe(void) | |||
| 2018 | /* Wait for Device ready. | 2018 | /* Wait for Device ready. |
| 2019 | */ | 2019 | */ |
| 2020 | do { | 2020 | do { |
| 2021 | val = readl((void *)PSC_AC97STAT); | 2021 | val = au_readl(PSC_AC97STAT); |
| 2022 | au_sync(); | 2022 | au_sync(); |
| 2023 | } while ((val & PSC_AC97STAT_DR) == 0); | 2023 | } while ((val & PSC_AC97STAT_DR) == 0); |
| 2024 | 2024 | ||
