diff options
| author | Christoph Hellwig <hch@lst.de> | 2015-12-07 06:56:36 -0800 |
|---|---|---|
| committer | Christoph Hellwig <hch@lst.de> | 2015-12-11 11:52:27 -0800 |
| commit | 0bc92ace52ef3ed1c8eb9bcf36cd3d7ca72d5d14 (patch) | |
| tree | 0a76114d5562b687843015ee8c6c2c1ce87c68ec | |
| parent | ea51190c03150fce4d9e428bfb608abbe0991db8 (diff) | |
| download | linux-0-day-0bc92ace52ef3ed1c8eb9bcf36cd3d7ca72d5d14.tar.gz linux-0-day-0bc92ace52ef3ed1c8eb9bcf36cd3d7ca72d5d14.tar.xz | |
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>
| -rw-r--r-- | include/linux/irq_poll.h | 5 | ||||
| -rw-r--r-- | lib/irq_poll.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/irq_poll.h b/include/linux/irq_poll.h index 57efae6614002..b4ad03cee9d41 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 43a3370a09fd6..53d67e341ebb7 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); |