Module: xenomai-head
Branch: master
Commit: b0dbbac29cfa4c6e5b4a603ff49c1e1265aef782
URL:
http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=b0dbbac29cfa4c6e5b4a603ff49c1e1265aef782
Author: Philippe Gerum <r...@xenomai.org>
Date: Mon Sep 5 14:37:17 2011 +0200
hal: stop using IRQ_DISABLED
Tweaking IRQ_DISABLED from the IRQ descriptor status field is
deprecated, and was actually done out of a wrong understanding of the
meaning of this flag.
We do not need this when enabling/disabling an IRQ descriptor in any
case.
---
include/asm-arm/wrappers.h | 2 --
ksrc/arch/blackfin/hal.c | 4 ----
ksrc/arch/nios2/hal.c | 4 ----
ksrc/arch/powerpc/hal.c | 4 ----
ksrc/arch/sh/hal.c | 4 ----
ksrc/arch/x86/hal-common.c | 4 ----
6 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/include/asm-arm/wrappers.h b/include/asm-arm/wrappers.h
index ddd5faf..bd269ee 100644
--- a/include/asm-arm/wrappers.h
+++ b/include/asm-arm/wrappers.h
@@ -74,11 +74,9 @@ extern void (*fp_init)(union fp_state *);
#define rthal_irq_chip_end(irq) ({ rthal_irq_descp(irq)->ipipe_end(irq,
rthal_irq_descp(irq)); 0; })
typedef irq_handler_t rthal_irq_host_handler_t;
#define rthal_mark_irq_disabled(irq) do { \
- rthal_irq_desc_status(irq) |= IRQ_DISABLED; \
rthal_irq_descp(irq)->depth = 1; \
} while(0);
#define rthal_mark_irq_enabled(irq) do { \
- rthal_irq_desc_status(irq) &= ~IRQ_DISABLED; \
rthal_irq_descp(irq)->depth = 0; \
} while(0);
static inline void fp_init(union fp_state *state)
diff --git a/ksrc/arch/blackfin/hal.c b/ksrc/arch/blackfin/hal.c
index 7be2b74..871aae8 100644
--- a/ksrc/arch/blackfin/hal.c
+++ b/ksrc/arch/blackfin/hal.c
@@ -273,8 +273,6 @@ int rthal_irq_enable(unsigned irq)
if (irq >= IPIPE_NR_XIRQS || rthal_irq_descp(irq) == NULL)
return -EINVAL;
- rthal_irq_desc_status(irq) &= ~IRQ_DISABLED;
-
return rthal_irq_chip_enable(irq);
}
@@ -284,8 +282,6 @@ int rthal_irq_disable(unsigned irq)
if (irq >= IPIPE_NR_XIRQS || rthal_irq_descp(irq) == NULL)
return -EINVAL;
- rthal_irq_desc_status(irq) |= IRQ_DISABLED;
-
return rthal_irq_chip_disable(irq);
}
diff --git a/ksrc/arch/nios2/hal.c b/ksrc/arch/nios2/hal.c
index 86306fd..96bd23d 100644
--- a/ksrc/arch/nios2/hal.c
+++ b/ksrc/arch/nios2/hal.c
@@ -100,8 +100,6 @@ int rthal_irq_enable(unsigned irq)
if (irq >= IPIPE_NR_XIRQS || rthal_irq_descp(irq) == NULL)
return -EINVAL;
- rthal_irq_desc_status(irq) &= ~IRQ_DISABLED;
-
return rthal_irq_chip_enable(irq);
}
@@ -111,8 +109,6 @@ int rthal_irq_disable(unsigned irq)
if (irq >= IPIPE_NR_XIRQS || rthal_irq_descp(irq) == NULL)
return -EINVAL;
- rthal_irq_desc_status(irq) |= IRQ_DISABLED;
-
return rthal_irq_chip_disable(irq);
}
diff --git a/ksrc/arch/powerpc/hal.c b/ksrc/arch/powerpc/hal.c
index 6e81ee6..d933d96 100644
--- a/ksrc/arch/powerpc/hal.c
+++ b/ksrc/arch/powerpc/hal.c
@@ -377,8 +377,6 @@ int rthal_irq_enable(unsigned irq)
if (irq >= NR_IRQS || rthal_irq_descp(irq) == NULL)
return -EINVAL;
- rthal_irq_desc_status(irq) &= ~IRQ_DISABLED;
-
return rthal_irq_chip_enable(irq);
}
@@ -387,8 +385,6 @@ int rthal_irq_disable(unsigned irq)
if (irq >= NR_IRQS || rthal_irq_descp(irq) == NULL)
return -EINVAL;
- rthal_irq_desc_status(irq) |= IRQ_DISABLED;
-
return rthal_irq_chip_disable(irq);
}
diff --git a/ksrc/arch/sh/hal.c b/ksrc/arch/sh/hal.c
index 0c81538..85db35a 100644
--- a/ksrc/arch/sh/hal.c
+++ b/ksrc/arch/sh/hal.c
@@ -138,8 +138,6 @@ int rthal_irq_enable(unsigned irq)
if (irq >= IPIPE_NR_XIRQS || rthal_irq_descp(irq) == NULL)
return -EINVAL;
- rthal_irq_desc_status(irq) &= ~IRQ_DISABLED;
-
return rthal_irq_chip_enable(irq);
}
@@ -149,8 +147,6 @@ int rthal_irq_disable(unsigned irq)
if (irq >= IPIPE_NR_XIRQS || rthal_irq_descp(irq) == NULL)
return -EINVAL;
- rthal_irq_desc_status(irq) |= IRQ_DISABLED;
-
return rthal_irq_chip_disable(irq);
}
diff --git a/ksrc/arch/x86/hal-common.c b/ksrc/arch/x86/hal-common.c
index 254beaa..63dac98 100644
--- a/ksrc/arch/x86/hal-common.c
+++ b/ksrc/arch/x86/hal-common.c
@@ -352,8 +352,6 @@ int rthal_irq_enable(unsigned irq)
if (irq >= NR_IRQS || rthal_irq_descp(irq) == NULL)
return -EINVAL;
- rthal_irq_desc_status(irq) &= ~IRQ_DISABLED;
-
return rthal_irq_chip_enable(irq);
}
@@ -363,8 +361,6 @@ int rthal_irq_disable(unsigned irq)
if (irq >= NR_IRQS || rthal_irq_descp(irq) == NULL)
return -EINVAL;
- rthal_irq_desc_status(irq) |= IRQ_DISABLED;
-
return rthal_irq_chip_disable(irq);
}
_______________________________________________
Xenomai-git mailing list
Xenomai-git@gna.org
https://mail.gna.org/listinfo/xenomai-git
