[PATCH] sched / idle: Make cpuidle_idle_call() void

[PATCH] sched / idle: Make cpuidle_idle_call() void

[Rafael J. Wysocki]

From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

The only value ever returned by cpuidle_idle_call() is 0 and its
only caller ignores that value anyway, so make it void.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 kernel/sched/idle.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Index: linux-pm/kernel/sched/idle.c
===================================================================
--- linux-pm.orig/kernel/sched/idle.c
+++ linux-pm/kernel/sched/idle.c
@@ -67,9 +67,8 @@ void __weak arch_cpu_idle(void)
  * cpuidle_idle_call - the main idle function
  *
  * NOTE: no locks or semaphores should be used here
- * return non-zero on failure
  */
-static int cpuidle_idle_call(void)
+static void cpuidle_idle_call(void)
 {
 	struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
 	struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
@@ -84,7 +83,7 @@ static int cpuidle_idle_call(void)
 	if (current_clr_polling_and_test()) {
 		local_irq_enable();
 		__current_set_polling();
-		return 0;
+		return;
 	}
 
 	/*
@@ -189,8 +188,6 @@ static int cpuidle_idle_call(void)
 
 	rcu_idle_exit();
 	start_critical_timings();
-
-	return 0;
 }
 
 /*

Re: [PATCH] sched / idle: Make cpuidle_idle_call() void

[Peter Zijlstra]

On Mon, Apr 21, 2014 at 01:26:58AM +0200, Rafael J. Wysocki wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> The only value ever returned by cpuidle_idle_call() is 0 and its
> only caller ignores that value anyway, so make it void.
> 
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

Thanks!

Re: [PATCH] sched / idle: Make cpuidle_idle_call() void

[Rafael J. Wysocki]

On Tuesday, April 22, 2014 01:49:30 PM Peter Zijlstra wrote:
> On Mon, Apr 21, 2014 at 01:26:58AM +0200, Rafael J. Wysocki wrote:
> > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > 
> > The only value ever returned by cpuidle_idle_call() is 0 and its
> > only caller ignores that value anyway, so make it void.
> > 
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> Thanks!

OK, thanks, so should it go through my tree or through tip?

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [PATCH] sched / idle: Make cpuidle_idle_call() void

[Peter Zijlstra]

On Wed, Apr 23, 2014 at 01:36:42AM +0200, Rafael J. Wysocki wrote:
> On Tuesday, April 22, 2014 01:49:30 PM Peter Zijlstra wrote:
> > On Mon, Apr 21, 2014 at 01:26:58AM +0200, Rafael J. Wysocki wrote:
> > > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > > 
> > > The only value ever returned by cpuidle_idle_call() is 0 and its
> > > only caller ignores that value anyway, so make it void.
> > > 
> > > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> > 
> > Thanks!
> 
> OK, thanks, so should it go through my tree or through tip?

I'll take it through tip where there's more patches that touch this
code.

[tip:sched/core] sched/idle: Make cpuidle_idle_call() void

[tip-bot for Rafael J. Wysocki]

Commit-ID:  08c373e5123b4595588ae1a7aa7e00a046c61cc6
Gitweb:     http://git.kernel.org/tip/08c373e5123b4595588ae1a7aa7e00a046c61cc6
Author:     Rafael J. Wysocki <rafael.j.wysocki@intel.com>
AuthorDate: Mon, 21 Apr 2014 01:26:58 +0200
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Thu, 8 May 2014 09:17:00 +0200

sched/idle: Make cpuidle_idle_call() void

The only value ever returned by cpuidle_idle_call() is 0 and its
only caller ignores that value anyway, so make it void.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/4717784.WmVEpDoliM@vostro.rjw.lan
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/sched/idle.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/kernel/sched/idle.c b/kernel/sched/idle.c
index 88a6bc4..34083c9 100644
--- a/kernel/sched/idle.c
+++ b/kernel/sched/idle.c
@@ -67,9 +67,8 @@ void __weak arch_cpu_idle(void)
  * cpuidle_idle_call - the main idle function
  *
  * NOTE: no locks or semaphores should be used here
- * return non-zero on failure
  */
-static int cpuidle_idle_call(void)
+static void cpuidle_idle_call(void)
 {
 	struct cpuidle_device *dev = __this_cpu_read(cpuidle_devices);
 	struct cpuidle_driver *drv = cpuidle_get_cpu_driver(dev);
@@ -82,7 +81,7 @@ static int cpuidle_idle_call(void)
 	 */
 	if (need_resched()) {
 		local_irq_enable();
-		return 0;
+		return;
 	}
 
 	/*
@@ -177,8 +176,6 @@ exit_idle:
 
 	rcu_idle_exit();
 	start_critical_timings();
-
-	return 0;
 }
 
 /*