Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc850f39 authored Mar 26, 2012 by Daniel Lezcano Committed by Len Brown Mar 30, 2012

cpuidle: use the driver's state_count as default



If the state_count is not initialized for the device use
the driver's state count as the default. That will prevent
to add it manually in the cpuidle driver initialization
routine and will save us from duplicate line of code.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 3a53396b

drivers/cpuidle/cpuidle.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -268,7 +268,7 @@ int cpuidle_enable_device(struct cpuidle_device *dev)
		if (!drv \|\| !cpuidle_curr_governor)
		return -EIO;
		if (!dev->state_count)
		return -EINVAL;
		dev->state_count = drv->state_count;

		if (dev->registered == 0) {
		ret = __cpuidle_register_device(dev);

drivers/cpuidle/driver.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ static void __cpuidle_register_driver(struct cpuidle_driver *drv)
		*/
		int cpuidle_register_driver(struct cpuidle_driver *drv)
		{
		if (!drv)
		if (!drv \|\| !drv->state_count)
		return -EINVAL;

		if (cpuidle_disabled())