summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuergen Gross <jgross@suse.com>2021-02-11 10:09:53 +0300
committerThomas Gleixner <tglx@linutronix.de>2021-03-17 23:44:01 +0300
commit2c6b02185cc608c19a22691fadc6ca2cd114c286 (patch)
tree4f3289909b9a5f4a56eef04ff9094f07225f243e
parentba9e6cab49c1465c2c322dcb03d771d5cbecb692 (diff)
downloadlinux-2c6b02185cc608c19a22691fadc6ca2cd114c286.tar.xz
irq: Simplify condition in irq_matrix_reserve()
The if condition in irq_matrix_reserve() can be much simpler. While at it fix a typo in the comment. Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20210211070953.5914-1-jgross@suse.com
-rw-r--r--kernel/irq/matrix.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/irq/matrix.c b/kernel/irq/matrix.c
index 7a9465ffe71d..6f8b1d171cdc 100644
--- a/kernel/irq/matrix.c
+++ b/kernel/irq/matrix.c
@@ -337,15 +337,14 @@ void irq_matrix_assign(struct irq_matrix *m, unsigned int bit)
* irq_matrix_reserve - Reserve interrupts
* @m: Matrix pointer
*
- * This is merily a book keeping call. It increments the number of globally
+ * This is merely a book keeping call. It increments the number of globally
* reserved interrupt bits w/o actually allocating them. This allows to
* setup interrupt descriptors w/o assigning low level resources to it.
* The actual allocation happens when the interrupt gets activated.
*/
void irq_matrix_reserve(struct irq_matrix *m)
{
- if (m->global_reserved <= m->global_available &&
- m->global_reserved + 1 > m->global_available)
+ if (m->global_reserved == m->global_available)
pr_warn("Interrupt reservation exceeds available resources\n");
m->global_reserved++;