Commit 1df97a02 authored Feb 27, 2020 by Rafael J. Wysocki

Merge tag 'devfreq-fixes-for-5.6-rc4' of...

Merge tag 'devfreq-fixes-for-5.6-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux

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"

parents f8788d86 66d0e797

drivers/devfreq/devfreq.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -738,7 +738,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) {
		@@ -800,8 +799,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);

Admin message