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

Commit 4955a541 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz Committed by Rafael J. Wysocki
Browse files

intel_idle: remove superfluous dev->state_count initialization 



intel_idle driver sets dev->state_count to drv->state_count so
the default dev->state_count initialization in cpuidle_enable_device()
(called from cpuidle_register_device()) can be used instead.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Cc: Len Brown <lenb@kernel.org>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent dbf87ab8

drivers/idle/intel_idle.c

+0 −29
Original line number Diff line number Diff line
@@ -644,39 +644,10 @@ static int __init intel_idle_cpuidle_driver_init(void) 
 */

static int intel_idle_cpu_init(int cpu)

{

	int cstate;

	struct cpuidle_device *dev;



	dev = per_cpu_ptr(intel_idle_cpuidle_devices, cpu);



	dev->state_count = 1;



	for (cstate = 0; cstate < CPUIDLE_STATE_MAX; ++cstate) {

		int num_substates, mwait_hint, mwait_cstate, mwait_substate;



		if (cpuidle_state_table[cstate].enter == NULL)

			break;



		if (cstate + 1 > max_cstate) {

			printk(PREFIX "max_cstate %d reached\n", max_cstate);

			break;

		}



		mwait_hint = flg2MWAIT(cpuidle_state_table[cstate].flags);

		mwait_cstate = MWAIT_HINT2CSTATE(mwait_hint);

		mwait_substate = MWAIT_HINT2SUBSTATE(mwait_hint);



		/* does the state exist in CPUID.MWAIT? */

		num_substates = (mwait_substates >> ((mwait_cstate + 1) * 4))

					& MWAIT_SUBSTATE_MASK;



		/* if sub-state in table is not enumerated by CPUID */

		if ((mwait_substate + 1) > num_substates)

			continue;



		dev->state_count += 1;

	}



	dev->cpu = cpu;



	if (cpuidle_register_device(dev)) {