summaryrefslogtreecommitdiffstats
path: root/lib/irq_poll.c
diff options
context:
space:
mode:
authorChristoph Hellwig <hch@lst.de>2015-12-07 06:56:36 -0800
committerChristoph Hellwig <hch@lst.de>2015-12-11 11:52:27 -0800
commit0bc92ace52ef3ed1c8eb9bcf36cd3d7ca72d5d14 (patch)
tree0a76114d5562b687843015ee8c6c2c1ce87c68ec /lib/irq_poll.c
parentea51190c03150fce4d9e428bfb608abbe0991db8 (diff)
downloadlinux-stable-0bc92ace52ef3ed1c8eb9bcf36cd3d7ca72d5d14.tar.gz
linux-stable-0bc92ace52ef3ed1c8eb9bcf36cd3d7ca72d5d14.tar.bz2
linux-stable-0bc92ace52ef3ed1c8eb9bcf36cd3d7ca72d5d14.zip
irq_poll: fold irq_poll_disable_pending into irq_poll_softirq
Signed-off-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Diffstat (limited to 'lib/irq_poll.c')
-rw-r--r--lib/irq_poll.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/irq_poll.c b/lib/irq_poll.c
index 43a3370a09fd..53d67e341ebb 100644
--- a/lib/irq_poll.c
+++ b/lib/irq_poll.c
@@ -122,7 +122,7 @@ static void irq_poll_softirq(struct softirq_action *h)
* move the instance around on the list at-will.
*/
if (work >= weight) {
- if (irq_poll_disable_pending(iop))
+ if (test_bit(IRQ_POLL_F_DISABLE, &iop->state))
__irq_poll_complete(iop);
else
list_move_tail(&iop->list, list);