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

Commit 52ab3535 authored by Jonathan Avila's avatar Jonathan Avila Committed by Amir Vajid
Browse files

Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs" 



This reverts commit 4585fbcb. The change
to be reverted would add probe order-dependent numbers to the end of each
devfreq device, making our post boot script (among others) incredibly
brittle.

Change-Id: I8fdb679ae651d9f425ffd60e2141613ae20bb029
Signed-off-by: default avatarJonathan Avila <avilaj@codeaurora.org>
[avajid@codeaurora.org: resolved trival merge conflicts]
Signed-off-by: default avatarAmir Vajid <avajid@codeaurora.org>
parent 1bb4b043

drivers/devfreq/devfreq.c

+1 −3
Original line number Diff line number Diff line
@@ -613,7 +613,6 @@ struct devfreq *devfreq_add_device(struct device *dev, 
{

	struct devfreq *devfreq;

	struct devfreq_governor *governor;

	static atomic_t devfreq_no = ATOMIC_INIT(-1);

	int err = 0;



	if (!dev || !profile || !governor_name) {
@@ -676,8 +675,7 @@ struct devfreq *devfreq_add_device(struct device *dev, 
	devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev);

	atomic_set(&devfreq->suspend_count, 0);



	dev_set_name(&devfreq->dev, "devfreq%d",

				atomic_inc_return(&devfreq_no));

	dev_set_name(&devfreq->dev, "%s", dev_name(dev));

	err = device_register(&devfreq->dev);

	if (err) {

		mutex_unlock(&devfreq->lock);