[PATCH] atm: nicstar: Replace spin_is_locked() with spin_trylock()

From: Lance Roy
Date: Thu Oct 04 2018 - 03:47:01 EST


ns_poll() used spin_is_locked() + spin_lock() to get achieve the same
thing as a spin_trylock(), so simplify it by using that instead. This is
also a step towards possibly removing spin_is_locked().

Signed-off-by: Lance Roy <ldr709@xxxxxxxxx>
Cc: Chas Williams <3chas3@xxxxxxxxx>
Cc: <linux-atm-general@xxxxxxxxxxxxxxxxxxxxx>
Cc: <netdev@xxxxxxxxxxxxxxx>
---
drivers/atm/nicstar.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index cbec9adc01c7..ae4aa02e4dc6 100644
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
@@ -2689,11 +2689,10 @@ static void ns_poll(struct timer_list *unused)
PRINTK("nicstar: Entering ns_poll().\n");
for (i = 0; i < num_cards; i++) {
card = cards[i];
- if (spin_is_locked(&card->int_lock)) {
+ if (!spin_trylock_irqsave(&card->int_lock, flags)) {
/* Probably it isn't worth spinning */
continue;
}
- spin_lock_irqsave(&card->int_lock, flags);

stat_w = 0;
stat_r = readl(card->membase + STAT);
--
2.19.0