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>

diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index a0df401ebb9fba9f4f2244dccf709e28e61bc50c..94c6ea7fa7c24b4148fbda72e56ef93d2f27442a 100644 (file)
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -188,7 +188,7 @@ static void spu_reset(void)
        spu_memset(0, 0, 0x200000 / 4);
        /* Put ARM7 in endless loop */
        local_irq_save(flags);
-       ctrl_outl(0xea000002, SPU_MEMORY_BASE);
+       __raw_writel(0xea000002, SPU_MEMORY_BASE);
        local_irq_restore(flags);
        spu_enable();
 }

diff --git a/sound/soc/sh/sh7760-ac97.c b/sound/soc/sh/sh7760-ac97.c
index b897f7b96d8990bbd0bee2c199bdf4531b9c6840..f8e0ab82ef59e188714ba8851048534f0691e10b 100644 (file)
--- 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)
        unsigned short ipsel;
 
        /* enable both AC97 controllers in pinmux reg */
-       ipsel = ctrl_inw(IPSEL);
-       ctrl_outw(ipsel | (3 << 10), IPSEL);
+       ipsel = __raw_readw(IPSEL);
+       __raw_writew(ipsel | (3 << 10), IPSEL);
 
        ret = -ENOMEM;
        sh7760_ac97_snd_device = platform_device_alloc("soc-audio", -1);