arm/irq: switch to plain bool

Also removed a redundant pair of brackets.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Julien Grall <julien.grall@arm.com>

diff --git a/xen/arch/arm/irq.c b/xen/arch/arm/irq.c
index f3f20a69c73d1f78dc62cf5f7d46d78b9d32b526..cbc7e6ebb8fe6ccf49d2f0f6982214676b1c7fd6 100644 (file)
--- a/xen/arch/arm/irq.c
+++ b/xen/arch/arm/irq.c
@@ -315,7 +315,7 @@ void release_irq(unsigned int irq, const void *dev_id)
 static int __setup_irq(struct irq_desc *desc, unsigned int irqflags,
                        struct irqaction *new)
 {
-    bool_t shared = !!(irqflags & IRQF_SHARED);
+    bool shared = irqflags & IRQF_SHARED;
 
     ASSERT(new != NULL);
 
@@ -344,7 +344,7 @@ int setup_irq(unsigned int irq, unsigned int irqflags, struct irqaction *new)
     int rc;
     unsigned long flags;
     struct irq_desc *desc;
-    bool_t disabled;
+    bool disabled;
 
     desc = irq_to_desc(irq);
 
@@ -387,10 +387,10 @@ err:
     return rc;
 }
 
-bool_t is_assignable_irq(unsigned int irq)
+bool is_assignable_irq(unsigned int irq)
 {
     /* For now, we can only route SPIs to the guest */
-    return ((irq >= NR_LOCAL_IRQS) && (irq < gic_number_lines()));
+    return (irq >= NR_LOCAL_IRQS) && (irq < gic_number_lines());
 }
 
 /*
@@ -399,7 +399,7 @@ bool_t is_assignable_irq(unsigned int irq)
  *
  * XXX: See whether it is possible to let any domain configure the type.
  */
-bool_t irq_type_set_by_domain(const struct domain *d)
+bool irq_type_set_by_domain(const struct domain *d)
 {
     return (d == hardware_domain);
 }
@@ -602,7 +602,7 @@ void pirq_set_affinity(struct domain *d, int pirq, const cpumask_t *mask)
     BUG();
 }
 
-static bool_t irq_validate_new_type(unsigned int curr, unsigned new)
+static bool irq_validate_new_type(unsigned int curr, unsigned new)
 {
     return (curr == IRQ_TYPE_INVALID || curr == new );
 }

diff --git a/xen/include/asm-arm/irq.h b/xen/include/asm-arm/irq.h
index 7c7662608aa35e001da8c4b858e19fb4c068a195..2de76d0f56af6497d8a44eb1bcd04e4f74e197ba 100644 (file)
--- a/xen/include/asm-arm/irq.h
+++ b/xen/include/asm-arm/irq.h
@@ -51,7 +51,7 @@ static inline bool is_lpi(unsigned int irq)
 
 #define domain_pirq_to_irq(d, pirq) (pirq)
 
-bool_t is_assignable_irq(unsigned int irq);
+bool is_assignable_irq(unsigned int irq);
 
 void init_IRQ(void);
 void init_secondary_IRQ(void);
@@ -77,7 +77,7 @@ void irq_set_affinity(struct irq_desc *desc, const cpumask_t *cpu_mask);
  * Use this helper in places that need to know whether the IRQ type is
  * set by the domain.
  */
-bool_t irq_type_set_by_domain(const struct domain *d);
+bool irq_type_set_by_domain(const struct domain *d);
 
 #endif /* _ASM_HW_IRQ_H */
 /*