heart_alloc_int() opencodes find_and_set_bit(). Simplify it by using the
dedicated function, and make a nice one-liner.
Signed-off-by: Yury Norov <yury.norov@xxxxxxxxx>
---
arch/mips/sgi-ip30/ip30-irq.c | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/arch/mips/sgi-ip30/ip30-irq.c b/arch/mips/sgi-ip30/ip30-irq.c
index 423c32cb66ed..a70e7af93643 100644
--- a/arch/mips/sgi-ip30/ip30-irq.c
+++ b/arch/mips/sgi-ip30/ip30-irq.c
@@ -2,6 +2,7 @@
/*
* ip30-irq.c: Highlevel interrupt handling for IP30 architecture.
*/
+#include <linux/find_atomic.h>
#include <linux/errno.h>
#include <linux/init.h>
#include <linux/interrupt.h>
@@ -28,17 +29,9 @@ static DEFINE_PER_CPU(unsigned long, irq_enable_mask);
static inline int heart_alloc_int(void)
{
- int bit;
+ int bit = find_and_set_bit(heart_irq_map, HEART_NUM_IRQS);
-again:
- bit = find_first_zero_bit(heart_irq_map, HEART_NUM_IRQS);
- if (bit >= HEART_NUM_IRQS)
- return -ENOSPC;
-
- if (test_and_set_bit(bit, heart_irq_map))
- goto again;
-
- return bit;
+ return bit < HEART_NUM_IRQS ? bit : -ENOSPC;
}
static void ip30_error_irq(struct irq_desc *desc)
--
2.43.0
