diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/oss/au1550_ac97.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 | ||