diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-10-27 02:53:50 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-10-27 02:53:50 -0400 |
| commit | 48ccb2ceec6fb1d46d1bc92dadc602d4341a0149 (patch) | |
| tree | 5242f572316c3a0efd56cfbb4539c4e753fa32f7 /sound/soc/sh | |
| parent | 1e5cefd01af079d8efadfde78c045be15e6c1b23 (diff) | |
sound: sh: ctrl_in/outX to __raw_read/writeX conversion.
The ctrl_xxx routines are deprecated, switch over to the __raw_xxx
versions.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'sound/soc/sh')
| -rw-r--r-- | sound/soc/sh/sh7760-ac97.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c index b897f7b96d89..f8e0ab82ef59 100644 --- a/sound/soc/sh/sh7760-ac97.c +++ b/sound/soc/sh/sh7760-ac97.c | |||
| @@ -52,8 +52,8 @@ static int __init sh7760_ac97_init(void) | |||
| 52 | unsigned short ipsel; | 52 | unsigned short ipsel; |
| 53 | 53 | ||
| 54 | /* enable both AC97 controllers in pinmux reg */ | 54 | /* enable both AC97 controllers in pinmux reg */ |
| 55 | ipsel = ctrl_inw(IPSEL); | 55 | ipsel = __raw_readw(IPSEL); |
| 56 | ctrl_outw(ipsel | (3 << 10), IPSEL); | 56 | __raw_writew(ipsel | (3 << 10), IPSEL); |
| 57 | 57 | ||
| 58 | ret = -ENOMEM; | 58 | ret = -ENOMEM; |
| 59 | sh7760_ac97_snd_device = platform_device_alloc("soc-audio", -1); | 59 | sh7760_ac97_snd_device = platform_device_alloc("soc-audio", -1); |