From 52ab3535b24cd6464f9f59927892962b329e5f66 Mon Sep 17 00:00:00 2001 From: Jonathan Avila Date: Wed, 16 Jan 2019 20:27:47 -0800 Subject: [PATCH] Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs" This reverts commit 4585fbcb5331fc910b7e553ad3efd0dd7b320d14. 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: Jonathan Avila [avajid@codeaurora.org: resolved trival merge conflicts] Signed-off-by: Amir Vajid --- drivers/devfreq/devfreq.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c index 446490c9d635..18285305b86f 100644 --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c @@ -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);