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>

2 files changed, 1 insertions, 6 deletions

diff --git a/include/linux/irq_poll.h b/include/linux/irq_poll.h
index 57efae661400..b4ad03cee9d4 100644
--- a/include/linux/irq_poll.h
+++ b/include/linux/irq_poll.h
@@ -18,11 +18,6 @@ enum {
         IRQ_POLL_F_DISABLE      = 1,
 };
 
-static inline int irq_poll_disable_pending(struct irq_poll *iop)
-{
-        return test_bit(IRQ_POLL_F_DISABLE, &iop->state);
-}
-
 extern void irq_poll_sched(struct irq_poll *);
 extern void irq_poll_init(struct irq_poll *, int, irq_poll_fn *);
 extern void irq_poll_complete(struct irq_poll *);
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);