ALSA: mpu401: clean up interrupt specification

[deliverable/linux.git] / include / sound / mpu401.h

diff --git a/include/sound/mpu401.h b/include/sound/mpu401.h
index 1f1d53f8830b55036dbf241bb38e227d8e121b5f..20230db00ef17095d899de2f9287ba9a5e1ff0e6 100644 (file)
--- a/include/sound/mpu401.h
+++ b/include/sound/mpu401.h
@@ -50,7 +50,10 @@
 #define MPU401_INFO_INTEGRATED (1 << 2)        /* integrated h/w port */
 #define MPU401_INFO_MMIO       (1 << 3)        /* MMIO access */
 #define MPU401_INFO_TX_IRQ     (1 << 4)        /* independent TX irq */
+#define MPU401_INFO_IRQ_HOOK   (1 << 5)        /* mpu401 irq handler is called
+                                                  from driver irq handler */
 #define MPU401_INFO_NO_ACK     (1 << 6)        /* No ACK cmd needed */
+#define MPU401_INFO_USE_TIMER  (1 << 15)       /* internal */
 
 #define MPU401_MODE_BIT_INPUT          0
 #define MPU401_MODE_BIT_OUTPUT         1
@@ -73,8 +76,7 @@ struct snd_mpu401 {
        unsigned long port;             /* base port of MPU-401 chip */
        unsigned long cport;            /* port + 1 (usually) */
        struct resource *res;           /* port resource */
-       int irq;                        /* IRQ number of MPU-401 chip (-1 = poll) */
-       int irq_flags;
+       int irq;                        /* IRQ number of MPU-401 chip */
 
        unsigned long mode;             /* MPU401_MODE_XXXX */
        int timer_invoked;
@@ -131,7 +133,6 @@ int snd_mpu401_uart_new(struct snd_card *card,
                        unsigned long port,
                        unsigned int info_flags,
                        int irq,
-                       int irq_flags,
                        struct snd_rawmidi ** rrawmidi);
 
 #endif /* __SOUND_MPU401_H */