Changeset 314 for GPL/branches/uniaud-2.0

Timestamp:

Mar 24, 2008, 9:35:14 AM (17 years ago)

Author:

Paul Smedley

Message:

Fix warnings related to request_irq()

Location:

GPL/branches/uniaud-2.0

Files:

• alsa-kernel/include/sound/config.h (modified) (1 diff)
• include/linux/sched.h (modified) (1 diff)
• lib32/irq.c (modified) (1 diff)

GPL/branches/uniaud-2.0/alsa-kernel/include/sound/config.h

@@ -485 +485 @@
 typedef irqreturn_t (*snd_irq_handler_t)(int, void *);
 #define irq_handler_t snd_irq_handler_t
+#undef irq_handler_t
+#define irq_handler_t snd_irq_handler_t
+int request_irq(unsigned int, irq_handler_t handler,
+                    unsigned long, const char *, void *);
 
 #ifndef MODULE_ALIAS

GPL/branches/uniaud-2.0/include/linux/sched.h

@@ -47 +47 @@
 
 // 12 Jun 07 SHL Drop superfluous near
+#if 0
 extern int request_irq(unsigned int,
                        int (*handler)(int, void *, struct pt_regs *),
                        unsigned long, const char *, void *);
+#endif
 extern void free_irq(unsigned int, void *);
 extern void eoi_irq(unsigned int);

GPL/branches/uniaud-2.0/lib32/irq.c

@@ -66 +66 @@
 //******************************************************************************
 
-int request_irq(unsigned int irq,
-                int (near *handler)(int, void *, struct pt_regs *),
-                unsigned long x0, const char *x1, void *x2)
+int request_irq(unsigned irq, irq_handler_t handler,
+                    unsigned long x0, const char *x1, void *x2)
 {
     IRQ_SLOT    *pSlot = FindSlot(irq);