aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/cpuidle/cpuidle.c
diff options
context:
space:
mode:
authorViresh Kumar <viresh.kumar@linaro.org>2013-10-03 11:56:43 -0400
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2013-10-29 20:21:21 -0400
commit267d4bf8ee6dbde889f4c55d0188f561616dbc7a (patch)
treecdc48ab4279b5f831cbaf6a132c0675ffee95df1 /drivers/cpuidle/cpuidle.c
parentcaf4a36e818ba8df4e002b7dfa4eff5b8384dda0 (diff)
cpuidle: make __cpuidle_device_init() return void
The only value returned by __cpuidle_device_init() is 0, so it very well may be a void function. Make that happen. [rjw: Changelog] Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/cpuidle/cpuidle.c')
-rw-r--r--drivers/cpuidle/cpuidle.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/cpuidle/cpuidle.c b/drivers/cpuidle/cpuidle.c
index 8827c02af87c..211e504263fa 100644
--- a/drivers/cpuidle/cpuidle.c
+++ b/drivers/cpuidle/cpuidle.c
@@ -358,12 +358,10 @@ static void __cpuidle_unregister_device(struct cpuidle_device *dev)
358 module_put(drv->owner); 358 module_put(drv->owner);
359} 359}
360 360
361static int __cpuidle_device_init(struct cpuidle_device *dev) 361static void __cpuidle_device_init(struct cpuidle_device *dev)
362{ 362{
363 memset(dev->states_usage, 0, sizeof(dev->states_usage)); 363 memset(dev->states_usage, 0, sizeof(dev->states_usage));
364 dev->last_residency = 0; 364 dev->last_residency = 0;
365
366 return 0;
367} 365}
368 366
369/** 367/**
@@ -410,9 +408,7 @@ int cpuidle_register_device(struct cpuidle_device *dev)
410 if (dev->registered) 408 if (dev->registered)
411 goto out_unlock; 409 goto out_unlock;
412 410
413 ret = __cpuidle_device_init(dev); 411 __cpuidle_device_init(dev);
414 if (ret)
415 goto out_unlock;
416 412
417 ret = __cpuidle_register_device(dev); 413 ret = __cpuidle_register_device(dev);
418 if (ret) 414 if (ret)