Skip to contentSkip to conversation

irq_work: irq_work_queue function return value not used.

PATCH In review Frederic Weisbecker 2 participants 2 messages Feb 3, 2013 – Feb 4, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 irq_work: irq_work_queue function return value not used.

From: anish kumar <[email protected]>

As no one is using the return value of irq_work_queue function it is better to just make it void.

[fix stale comments, remove now unnecessary __irq_work_queue intermediate function]

---
 include/linux/irq_work.h |    2 +-
 kernel/irq_work.c        |   31 ++++++++++---------------------
 2 files changed, 11 insertions(+), 22 deletions(-)
include/linux/irq_work.h +1 -1
index 6a9e8f5..ce60c08 100644
@@ -16,7 +16,7 @@ void init_irq_work(struct irq_work *work, void (*func)(struct irq_work *))
 	work->func = func;
 }
 
-bool irq_work_queue(struct irq_work *work);
+void irq_work_queue(struct irq_work *work);
 void irq_work_run(void);
 void irq_work_sync(struct irq_work *work);
 
kernel/irq_work.c +10 -21
index 64eddd5..c9d7478 100644
@@ -63,12 +63,20 @@ void __weak arch_irq_work_raise(void)
 }
 
 /*
- * Queue the entry and raise the IPI if needed.
+ * Enqueue the irq_work @entry unless it's already pending
+ * somewhere.
+ *
+ * Can be re-enqueued while the callback is still in progress.
  */
-static void __irq_work_queue(struct irq_work *work)
+void irq_work_queue(struct irq_work *work)
 {
 	bool empty;
 
+	/* Only queue if not already pending */
+	if (!irq_work_claim(work))
+		return;
+
+	/* Queue the entry and raise the IPI if needed. */
 	preempt_disable();
 
 	empty = llist_add(&work->llnode, &__get_cpu_var(irq_work_list));
@@ -78,25 +86,6 @@ static void __irq_work_queue(struct irq_work *work)
 
 	preempt_enable();
 }
-
-/*
- * Enqueue the irq_work @entry, returns true on success, failure when the
- * @entry was already enqueued by someone else.
- *
- * Can be re-enqueued while the callback is still in progress.
- */
-bool irq_work_queue(struct irq_work *work)
-{
-	if (!irq_work_claim(work)) {
-		/*
-		 * Already enqueued, can't do!
-		 */
-		return false;
-	}
-
-	__irq_work_queue(work);
-	return true;
-}
 EXPORT_SYMBOL_GPL(irq_work_queue);
 
 /*
Signature · 1 line
1.7.5.4
#1 lore raw

[tip:irq/core] irq_work: Remove return value from the irq_work_queue() function

Commit-ID:  c02cf5f8ed6137e2b3b2f10e0fca336e06e09ba4
Gitweb:     http://git.kernel.org/tip/c02cf5f8ed6137e2b3b2f10e0fca336e06e09ba4
Author:     anish kumar <[email protected]>
AuthorDate: Sun, 3 Feb 2013 22:08:23 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 4 Feb 2013 11:50:59 +0100

irq_work: Remove return value from the irq_work_queue() function

As no one is using the return value of irq_work_queue(), so it is better to just make it void.

[ Fix stale comments, remove now unnecessary __irq_work_queue() intermediate function ]
---
 include/linux/irq_work.h |  2 +-
 kernel/irq_work.c        | 31 ++++++++++---------------------
 2 files changed, 11 insertions(+), 22 deletions(-)
include/linux/irq_work.h +1 -1
index 6a9e8f5..ce60c08 100644
@@ -16,7 +16,7 @@ void init_irq_work(struct irq_work *work, void (*func)(struct irq_work *))
 	work->func = func;
 }
 
-bool irq_work_queue(struct irq_work *work);
+void irq_work_queue(struct irq_work *work);
 void irq_work_run(void);
 void irq_work_sync(struct irq_work *work);
 
kernel/irq_work.c +10 -21
index 64eddd5..c9d7478 100644
@@ -63,12 +63,20 @@ void __weak arch_irq_work_raise(void)
 }
 
 /*
- * Queue the entry and raise the IPI if needed.
+ * Enqueue the irq_work @entry unless it's already pending
+ * somewhere.
+ *
+ * Can be re-enqueued while the callback is still in progress.
  */
-static void __irq_work_queue(struct irq_work *work)
+void irq_work_queue(struct irq_work *work)
 {
 	bool empty;
 
+	/* Only queue if not already pending */
+	if (!irq_work_claim(work))
+		return;
+
+	/* Queue the entry and raise the IPI if needed. */
 	preempt_disable();
 
 	empty = llist_add(&work->llnode, &__get_cpu_var(irq_work_list));
@@ -78,25 +86,6 @@ static void __irq_work_queue(struct irq_work *work)
 
 	preempt_enable();
 }
-
-/*
- * Enqueue the irq_work @entry, returns true on success, failure when the
- * @entry was already enqueued by someone else.
- *
- * Can be re-enqueued while the callback is still in progress.
- */
-bool irq_work_queue(struct irq_work *work)
-{
-	if (!irq_work_claim(work)) {
-		/*
-		 * Already enqueued, can't do!
-		 */
-		return false;
-	}
-
-	__irq_work_queue(work);
-	return true;
-}
 EXPORT_SYMBOL_GPL(irq_work_queue);
 
 /*