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

Commit 4a3dfb3f authored by Richard Cochran's avatar Richard Cochran Committed by Rafael J. Wysocki
Browse files

intel_idle: Remove redundant initialization calls. 



The function, intel_idle_cpuidle_driver_init, makes calls on each CPU
to auto_demotion_disable() and c1e_promotion_disable().  These calls
are redundant, as intel_idle_cpu_init() does the same calls just a bit
later on.  They are also premature, as the driver registration may yet
fail.

This patch removes the redundant code.

Signed-off-by: default avatarRichard Cochran <rcochran@linutronix.de>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 5469c827

drivers/idle/intel_idle.c

+0 −6
Original line number Original line Diff line number Diff line
@@ -1163,16 +1163,10 @@ static void __init intel_idle_cpuidle_driver_init(void) 
		drv->state_count += 1;

		drv->state_count += 1;

	}

	}





	if (icpu->auto_demotion_disable_flags)

		on_each_cpu(auto_demotion_disable, NULL, 1);



	if (icpu->byt_auto_demotion_disable_flag) {

	if (icpu->byt_auto_demotion_disable_flag) {

		wrmsrl(MSR_CC6_DEMOTION_POLICY_CONFIG, 0);

		wrmsrl(MSR_CC6_DEMOTION_POLICY_CONFIG, 0);

		wrmsrl(MSR_MC6_DEMOTION_POLICY_CONFIG, 0);

		wrmsrl(MSR_MC6_DEMOTION_POLICY_CONFIG, 0);

	}

	}



	if (icpu->disable_promotion_to_c1e)	/* each-cpu is redundant */

		on_each_cpu(c1e_promotion_disable, NULL, 1);

}

}