Commit 91a4b9e6 authored Feb 09, 2021 by Rafael J. Wysocki

Merge tag 'devfreq-next-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux

Pull devfreq changes for v5.12 from Chanwoo Choi:

"- Correct the spelling of comment in devfreq core
 - Replace devfreq->dev.parent with dev in devfreq core
 - Remove unneeded simicolon in rk3399_dmc.c"

* tag 'devfreq-next-for-5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux:
  PM / devfreq: rk3399_dmc: Remove unneeded semicolon
  PM / devfreq: Replace devfreq->dev.parent as dev in devfreq_add_device
  PM / devfreq: Correct spelling in a comment

parents 92bf2261 fc1745c0

drivers/devfreq/devfreq.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -893,13 +893,13 @@ struct devfreq devfreq_add_device(struct device dev,
		goto err_devfreq;

		devfreq->nb_min.notifier_call = qos_min_notifier_call;
		err = dev_pm_qos_add_notifier(devfreq->dev.parent, &devfreq->nb_min,
		err = dev_pm_qos_add_notifier(dev, &devfreq->nb_min,
		DEV_PM_QOS_MIN_FREQUENCY);
		if (err)
		goto err_devfreq;

		devfreq->nb_max.notifier_call = qos_max_notifier_call;
		err = dev_pm_qos_add_notifier(devfreq->dev.parent, &devfreq->nb_max,
		err = dev_pm_qos_add_notifier(dev, &devfreq->nb_max,
		DEV_PM_QOS_MAX_FREQUENCY);
		if (err)
		goto err_devfreq;

drivers/devfreq/governor.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@
		/*
		* Definition of governor attribute flags except for common sysfs attributes
		* - DEVFREQ_GOV_ATTR_POLLING_INTERVAL
		* : Indicate polling_interal sysfs attribute
		* : Indicate polling_interval sysfs attribute
		* - DEVFREQ_GOV_ATTR_TIMER
		* : Indicate timer sysfs attribute
		*/

drivers/devfreq/rk3399_dmc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -400,7 +400,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
		default:
		ret = -EINVAL;
		goto err_edev;
		};
		}

		no_pmu:
		arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0,