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

Commit 1f904a09 authored by Satya Durga Srinivasu Prabhala's avatar Satya Durga Srinivasu Prabhala
Browse files

sched/energy: remove rcu lock around dev_pm_opp_find_freq_floor 



Commit 052c6f19 ("PM / OPP: Move away from RCU locking")
removed need for RCU locking and introduced mutex lock, so, remove
rcu locking around dev_pm_opp_find_freq_floor call to avoid
calling sleeping function inside atomic context.

Change-Id: Id50bab9a6b9b3debb85af57bd16af22ac29e1398
Signed-off-by: default avatarSatya Durga Srinivasu Prabhala <satyap@codeaurora.org>
parent ad16cf89

kernel/sched/energy.c

+1 −6
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ static int sched_energy_probe(struct platform_device *pdev) 


		max_frequencies[cpu] = ULONG_MAX;



		rcu_read_lock();

		opp = dev_pm_opp_find_freq_floor(cpu_dev,

						 &max_frequencies[cpu]);

		if (IS_ERR_OR_NULL(opp)) {
@@ -196,9 +195,8 @@ static int sched_energy_probe(struct platform_device *pdev) 
				ret = -EPROBE_DEFER;

			else

				ret = PTR_ERR(opp);

			goto exit_rcu_unlock;

			goto exit;

		}

		rcu_read_unlock();



		/* Convert HZ to KHZ */

		max_frequencies[cpu] /= 1000;
@@ -266,9 +264,6 @@ static int sched_energy_probe(struct platform_device *pdev) 
	dev_info(&pdev->dev, "Sched-energy-costs capacity updated\n");

	return 0;



exit_rcu_unlock:

	rcu_read_unlock();



exit:

	if (ret != -EPROBE_DEFER)

		dev_err(&pdev->dev, "error=%d\n", ret);