| From 8236be259e33b1495fbc84b16d8f97bdf1127eb8 Mon Sep 17 00:00:00 2001 |
| From: Orson Zhai <orson.unisoc@gmail.com> |
| Date: Fri, 21 Feb 2020 01:37:04 +0800 |
| Subject: [PATCH] Revert "PM / devfreq: Modify the device name as devfreq(X) |
| for sysfs" |
| |
| commit 66d0e797bf095d407479c89952d42b1d96ef0a7f upstream. |
| |
| This reverts commit 4585fbcb5331fc910b7e553ad3efd0dd7b320d14. |
| |
| The name changing as devfreq(X) breaks some user space applications, |
| such as Android HAL from Unisoc and Hikey [1]. |
| The device name will be changed unexpectly after every boot depending |
| on module init sequence. It will make trouble to setup some system |
| configuration like selinux for Android. |
| |
| So we'd like to revert it back to old naming rule before any better |
| way being found. |
| |
| [1] https://lkml.org/lkml/2018/5/8/1042 |
| |
| Cc: John Stultz <john.stultz@linaro.org> |
| Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: stable@vger.kernel.org |
| Signed-off-by: Orson Zhai <orson.unisoc@gmail.com> |
| Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c |
| index 79651c2be752..12dc78477194 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) { |
| @@ -677,8 +676,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); |
| -- |
| 2.7.4 |
| |