sh: hp6xx mach-type cleanups.

[deliverable/linux.git] / sound / oss / sh_dac_audio.c

diff --git a/sound/oss/sh_dac_audio.c b/sound/oss/sh_dac_audio.c
index 8a9917c919c2e60cc00b06908f61d855bb184f3c..ae7fccc510a1cdb08cbf2773ff7ffb2692ddca8a 100644 (file)
--- a/sound/oss/sh_dac_audio.c
+++ b/sound/oss/sh_dac_audio.c
@@ -1,4 +1,3 @@
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/sched.h>
@@ -7,18 +6,15 @@
 #include <linux/fs.h>
 #include <linux/sound.h>
 #include <linux/soundcard.h>
+#include <linux/interrupt.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 #include <asm/delay.h>
-#include <linux/interrupt.h>
-
 #include <asm/cpu/dac.h>
-
-#ifdef MACH_HP600
+#include <asm/machvec.h>
 #include <asm/hp6xx/hp6xx.h>
 #include <asm/hd64461/hd64461.h>
-#endif
 
 #define MODNAME "sh_dac_audio"
 
@@ -72,26 +68,25 @@ static void dac_audio_sync(void)
 
 static void dac_audio_start(void)
 {
-#ifdef MACH_HP600
-       u16 v;
-       v = inw(HD64461_GPADR);
-       v &= ~HD64461_GPADR_SPEAKER;
-       outw(v, HD64461_GPADR);
-#endif
+       if (mach_is_hp6xx()) {
+               u16 v = inw(HD64461_GPADR);
+               v &= ~HD64461_GPADR_SPEAKER;
+               outw(v, HD64461_GPADR);
+       }
+
        sh_dac_enable(CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
        ctrl_outw(TMU1_TCR_INIT, TMU1_TCR);
 }
 static void dac_audio_stop(void)
 {
-#ifdef MACH_HP600
-       u16 v;
-#endif
        dac_audio_stop_timer();
-#ifdef MACH_HP600
-       v = inw(HD64461_GPADR);
-       v |= HD64461_GPADR_SPEAKER;
-       outw(v, HD64461_GPADR);
-#endif
+
+       if (mach_is_hp6xx()) {
+               u16 v = inw(HD64461_GPADR);
+               v |= HD64461_GPADR_SPEAKER;
+               outw(v, HD64461_GPADR);
+       }
+
        sh_dac_disable(CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL);
 }
 
@@ -289,7 +284,7 @@ static int __init dac_audio_init(void)
 
        in_use = 0;
 
-       data_buffer = (char *)kmalloc(BUFFER_SIZE, GFP_KERNEL);
+       data_buffer = kmalloc(BUFFER_SIZE, GFP_KERNEL);
        if (data_buffer == NULL)
                return -ENOMEM;
 
@@ -298,7 +293,7 @@ static int __init dac_audio_init(void)
        dac_audio_set_rate();
 
        retval =
-           request_irq(TIMER1_IRQ, timer1_interrupt, SA_INTERRUPT, MODNAME, 0);
+           request_irq(TIMER1_IRQ, timer1_interrupt, IRQF_DISABLED, MODNAME, 0);
        if (retval < 0) {
                printk(KERN_ERR "sh_dac_audio: IRQ %d request failed\n",
                       TIMER1_IRQ);