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

Commit dfcacc15 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpuidle: Clean up fallback handling in cpuidle_idle_call() 



Move the fallback code path in cpuidle_idle_call() to the end of the
function to avoid jumping to a label in an if () branch.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 31a34090

kernel/sched/idle.c

+15 −14
Original line number Diff line number Diff line
@@ -124,20 +124,8 @@ static void cpuidle_idle_call(void) 
	 * Fall back to the default arch idle method on errors.

	 */

	next_state = cpuidle_select(drv, dev);

	if (next_state < 0) {

use_default:

		/*

		 * We can't use the cpuidle framework, let's use the default

		 * idle routine.

		 */

		if (current_clr_polling_and_test())

			local_irq_enable();

		else

			arch_cpu_idle();



		goto exit_idle;

	}



	if (next_state < 0)

		goto use_default;



	/*

	 * The idle task must be scheduled, it is pointless to
@@ -195,6 +183,19 @@ static void cpuidle_idle_call(void) 


	rcu_idle_exit();

	start_critical_timings();

	return;



use_default:

	/*

	 * We can't use the cpuidle framework, let's use the default

	 * idle routine.

	 */

	if (current_clr_polling_and_test())

		local_irq_enable();

	else

		arch_cpu_idle();



	goto exit_idle;

}



/*