Pull a devfreq fix for 5.6-rc4 from Chanwoo Choi: "Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs" - This changes as devfreq(X) cause break some user space applications such as Android HAL from Unisoc and Hikey. In result, decide to revert it for preventing the HAL layer problem." * tag 'devfreq-fixes-for-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux: Revert "PM / devfreq: Modify the device name as devfreq(X) for sysfs"
Unified · Split
| @@ -738,7 +738,6 @@ struct devfreq *devfreq_add_device(struct device *dev, · 737 unmodified lines | |||
| 738 | { | 738 | { |
| 739 | struct devfreq *devfreq; | 739 | struct devfreq *devfreq; |
| 740 | struct devfreq_governor *governor; | 740 | struct devfreq_governor *governor; |
| 741 | static atomic_t devfreq_no = ATOMIC_INIT(-1); | ||
| 742 | int err = 0; | 741 | int err = 0; |
| 743 | 742 | ||
| 744 | if (!dev || !profile || !governor_name) { | 743 | if (!dev || !profile || !governor_name) { |
| @@ -800,8 +799,7 @@ struct devfreq *devfreq_add_device(struct device *dev, · 55 unmodified lines | |||
| 800 | devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev); | 799 | devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev); |
| 801 | atomic_set(&devfreq->suspend_count, 0); | 800 | atomic_set(&devfreq->suspend_count, 0); |
| 802 | 801 | ||
| 803 | dev_set_name(&devfreq->dev, "devfreq%d", | 802 | dev_set_name(&devfreq->dev, "%s", dev_name(dev)); |
| 804 | atomic_inc_return(&devfreq_no)); | ||
| 805 | err = device_register(&devfreq->dev); | 803 | err = device_register(&devfreq->dev); |
| 806 | if (err) { | 804 | if (err) { |
| 807 | mutex_unlock(&devfreq->lock); | 805 | mutex_unlock(&devfreq->lock); |