summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-12-06 15:47:51 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-12-06 15:47:51 -0800
commit61d6be3a7a1139285e16a672be72caefd4b1126b (patch)
treed1203b382576b0d33c1d0c5d66e4c1f4cd61dd73 /include
parentdabe589657ad0f9a0d6f4101e2171574f74b00bf (diff)
parent4ce413d1840b25b101be3c0559161db8891f3360 (diff)
downloadlinux-61d6be3a7a1139285e16a672be72caefd4b1126b.tar.gz
linux-61d6be3a7a1139285e16a672be72caefd4b1126b.tar.bz2
linux-61d6be3a7a1139285e16a672be72caefd4b1126b.zip
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Ingo Molnar: "Two fixes: use bool type consistently, plus a irq_matrix_available() bugfix" * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: irqdesc: Use bool return type instead of int genirq/matrix: Fix the precedence fix for real
Diffstat (limited to 'include')
-rw-r--r--include/linux/irqdesc.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
index dd418955962b..39fb3700f7a9 100644
--- a/include/linux/irqdesc.h
+++ b/include/linux/irqdesc.h
@@ -230,7 +230,7 @@ irq_set_chip_handler_name_locked(struct irq_data *data, struct irq_chip *chip,
data->chip = chip;
}
-static inline int irq_balancing_disabled(unsigned int irq)
+static inline bool irq_balancing_disabled(unsigned int irq)
{
struct irq_desc *desc;
@@ -238,7 +238,7 @@ static inline int irq_balancing_disabled(unsigned int irq)
return desc->status_use_accessors & IRQ_NO_BALANCING_MASK;
}
-static inline int irq_is_percpu(unsigned int irq)
+static inline bool irq_is_percpu(unsigned int irq)
{
struct irq_desc *desc;
@@ -246,7 +246,7 @@ static inline int irq_is_percpu(unsigned int irq)
return desc->status_use_accessors & IRQ_PER_CPU;
}
-static inline int irq_is_percpu_devid(unsigned int irq)
+static inline bool irq_is_percpu_devid(unsigned int irq)
{
struct irq_desc *desc;