Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1285927

[PATCH 04/13] irq_poll: fold irq_poll_disable_pending into irq_poll_softirq

Show all headers | View raw

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 include/linux/irq_poll.h | 5 -----
 lib/irq_poll.c           | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/include/linux/irq_poll.h b/include/linux/irq_poll.h
index 73d7c20..c3145c7 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 13cb149..2c7b8e6 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);
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

completion queue abstraction V2 Christoph Hellwig <hch@lst.de> - 2015-12-07 22:00 +0100
  [PATCH 06/13] irq_poll: remove unused data and max fields Christoph Hellwig <hch@lst.de> - 2015-12-07 22:00 +0100
  [PATCH 09/13] IB/srpt: use the new CQ API Christoph Hellwig <hch@lst.de> - 2015-12-07 22:00 +0100
  [PATCH 03/13] irq_poll: fold irq_poll_sched_prep into irq_poll_sched Christoph Hellwig <hch@lst.de> - 2015-12-07 22:10 +0100
  [PATCH 04/13] irq_poll: fold irq_poll_disable_pending into irq_poll_softirq Christoph Hellwig <hch@lst.de> - 2015-12-07 22:10 +0100
  [PATCH 02/13] irq_poll: don't disable new irq_poll instances Christoph Hellwig <hch@lst.de> - 2015-12-07 22:10 +0100
  [PATCH 01/13] irq_poll: make blk-iopoll available outside the block layer Christoph Hellwig <hch@lst.de> - 2015-12-07 22:10 +0100

csiph-web