[Xenomai-core] [JANITOR][PATCH] Avoid deprecated SA_SHIRQ

[Xenomai-core] [JANITOR][PATCH] Avoid deprecated SA_SHIRQ

[Jan Kiszka]

[-- Attachment #1.1: Type: text/plain, Size: 41 bytes --]

Kernel 2.6.22 starts to nag about this.

[-- Attachment #1.2: IRQF_SHARED.patch --]
[-- Type: text/plain, Size: 5156 bytes --]

Index: xenomai/include/asm-generic/wrappers.h
===================================================================
--- xenomai/include/asm-generic/wrappers.h	(Revision 2576)
+++ xenomai/include/asm-generic/wrappers.h	(Arbeitskopie)
@@ -265,6 +265,10 @@
 #define DECLARE_WORK_FUNC(f)		void f(struct work_struct *work)
 #endif /* >= 2.6.20 */
 
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,18)
+#define IRQF_SHARED			SA_SHIRQ
+#endif /* < 2.6.18 */
+
 #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) */
 
 #endif /* _XENO_ASM_GENERIC_WRAPPERS_H */
Index: xenomai/ksrc/arch/arm/hal.c
===================================================================
--- xenomai/ksrc/arch/arm/hal.c	(Revision 2576)
+++ xenomai/ksrc/arch/arm/hal.c	(Arbeitskopie)
@@ -107,12 +107,12 @@
 
     if (rthal_linux_irq[irq].count++ == 0 && rthal_irq_descp(irq)->action) {
         rthal_linux_irq[irq].flags = rthal_irq_descp(irq)->action->flags;
-        rthal_irq_descp(irq)->action->flags |= SA_SHIRQ;
+        rthal_irq_descp(irq)->action->flags |= IRQF_SHARED;
     }
 
     spin_unlock_irqrestore(rthal_irq_desc_lock(irq), flags);
 
-    return request_irq(irq, handler, SA_SHIRQ, name, dev_id);
+    return request_irq(irq, handler, IRQF_SHARED, name, dev_id);
 }
 
 int rthal_irq_host_release(unsigned irq, void *dev_id)
Index: xenomai/ksrc/arch/powerpc/hal.c
===================================================================
--- xenomai/ksrc/arch/powerpc/hal.c	(Revision 2576)
+++ xenomai/ksrc/arch/powerpc/hal.c	(Arbeitskopie)
@@ -236,12 +236,12 @@
 
     if (rthal_linux_irq[irq].count++ == 0 && rthal_irq_descp(irq)->action) {
         rthal_linux_irq[irq].flags = rthal_irq_descp(irq)->action->flags;
-        rthal_irq_descp(irq)->action->flags |= SA_SHIRQ;
+        rthal_irq_descp(irq)->action->flags |= IRQF_SHARED;
     }
 
     spin_unlock_irqrestore(&rthal_irq_descp(irq)->lock, flags);
 
-    return request_irq(irq, handler, SA_SHIRQ, name, dev_id);
+    return request_irq(irq, handler, IRQF_SHARED, name, dev_id);
 }
 
 int rthal_irq_host_release(unsigned irq, void *dev_id)
Index: xenomai/ksrc/arch/ia64/hal.c
===================================================================
--- xenomai/ksrc/arch/ia64/hal.c	(Revision 2576)
+++ xenomai/ksrc/arch/ia64/hal.c	(Arbeitskopie)
@@ -151,12 +151,12 @@
 
     if (rthal_linux_irq[irq].count++ == 0 && rthal_irq_descp(irq)->action) {
         rthal_linux_irq[irq].flags = rthal_irq_descp(irq)->action->flags;
-        rthal_irq_descp(irq)->action->flags |= SA_SHIRQ;
+        rthal_irq_descp(irq)->action->flags |= IRQF_SHARED;
     }
 
     spin_unlock_irqrestore(&rthal_irq_descp(irq)->lock, flags);
 
-    return request_irq(irq, handler, SA_SHIRQ, name, dev_id);
+    return request_irq(irq, handler, IRQF_SHARED, name, dev_id);
 }
 
 int rthal_irq_host_release(unsigned irq, void *dev_id)
Index: xenomai/ksrc/arch/blackfin/hal.c
===================================================================
--- xenomai/ksrc/arch/blackfin/hal.c	(Revision 2576)
+++ xenomai/ksrc/arch/blackfin/hal.c	(Arbeitskopie)
@@ -162,10 +162,10 @@
 	if (rthal_linux_irq[irq].count++ == 0 && rthal_irq_descp(irq)->action) {
 		rthal_linux_irq[irq].flags =
 		    rthal_irq_descp(irq)->action->flags;
-		rthal_irq_descp(irq)->action->flags |= SA_SHIRQ;
+		rthal_irq_descp(irq)->action->flags |= IRQF_SHARED;
 	}
 
-	return request_irq(irq, handler, SA_SHIRQ, name, dev_id);
+	return request_irq(irq, handler, IRQF_SHARED, name, dev_id);
 }
 
 int rthal_irq_host_release(unsigned irq, void *dev_id)
Index: xenomai/ksrc/arch/i386/hal.c
===================================================================
--- xenomai/ksrc/arch/i386/hal.c	(Revision 2576)
+++ xenomai/ksrc/arch/i386/hal.c	(Arbeitskopie)
@@ -416,12 +416,12 @@
 
     if (rthal_linux_irq[irq].count++ == 0 && rthal_irq_descp(irq)->action) {
         rthal_linux_irq[irq].flags = rthal_irq_descp(irq)->action->flags;
-        rthal_irq_descp(irq)->action->flags |= SA_SHIRQ;
+        rthal_irq_descp(irq)->action->flags |= IRQF_SHARED;
     }
 
     spin_unlock_irqrestore(&rthal_irq_descp(irq)->lock, flags);
 
-    return request_irq(irq, handler, SA_SHIRQ, name, dev_id);
+    return request_irq(irq, handler, IRQF_SHARED, name, dev_id);
 }
 
 int rthal_irq_host_release(unsigned irq, void *dev_id)
Index: xenomai/ksrc/arch/x86_64/hal.c
===================================================================
--- xenomai/ksrc/arch/x86_64/hal.c	(Revision 2576)
+++ xenomai/ksrc/arch/x86_64/hal.c	(Arbeitskopie)
@@ -201,12 +201,12 @@
 	if (rthal_linux_irq[irq].count++ == 0 && rthal_irq_descp(irq)->action) {
 		rthal_linux_irq[irq].flags =
 		    rthal_irq_descp(irq)->action->flags;
-		rthal_irq_descp(irq)->action->flags |= SA_SHIRQ;
+		rthal_irq_descp(irq)->action->flags |= IRQF_SHARED;
 	}
 
 	spin_unlock_irqrestore(&rthal_irq_descp(irq)->lock, flags);
 
-	return request_irq(irq, handler, SA_SHIRQ, name, dev_id);
+	return request_irq(irq, handler, IRQF_SHARED, name, dev_id);
 }
 
 int rthal_irq_host_release(unsigned irq, void *dev_id)

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 250 bytes --]