diff options
| author |   Lance Roy <ldr709@gmail.com> | 2018-10-04 00:46:57 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-10-05 14:31:29 -0700 |
| commit | 9a694c1de396e24565bfd05d0e36f72d10c3bce2 (patch) | |
| tree | 1c814239aec1dc35317299a3477d52f2bfb43932 /drivers/atm/nicstar.c | |
| parent | Merge branch 'hns3-Unicast-MAC-VLAN-table' (diff) | |
| download | linux-dev-9a694c1de396e24565bfd05d0e36f72d10c3bce2.tar.xz linux-dev-9a694c1de396e24565bfd05d0e36f72d10c3bce2.zip | |
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 <ldr709@gmail.com>
Cc: Chas Williams <3chas3@gmail.com>
Cc: <linux-atm-general@lists.sourceforge.net>
Cc: <netdev@vger.kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/atm/nicstar.c | 3 |
1 files changed, 1 insertions, 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); |