atm: nicstar: Replace spin_is_locked() with spin_trylock()

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 <[email protected]>
Cc: Chas Williams <[email protected]>
Cc: <[email protected]>
Cc: <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/drivers/atm/nicstar.c b/drivers/atm/nicstar.c
index cbec9adc01c768e95cf8a3ad000697019f38f65c..ae4aa02e4dc6e41e9e658b416cff91cb1fb266ba 100644 (file)
--- 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);