Commit 91a4b9e6 authored by Rafael J. Wysocki's avatar 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
...@@ -893,13 +893,13 @@ struct devfreq *devfreq_add_device(struct device *dev, ...@@ -893,13 +893,13 @@ struct devfreq *devfreq_add_device(struct device *dev,
goto err_devfreq; goto err_devfreq;
devfreq->nb_min.notifier_call = qos_min_notifier_call; 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); DEV_PM_QOS_MIN_FREQUENCY);
if (err) if (err)
goto err_devfreq; goto err_devfreq;
devfreq->nb_max.notifier_call = qos_max_notifier_call; 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); DEV_PM_QOS_MAX_FREQUENCY);
if (err) if (err)
goto err_devfreq; goto err_devfreq;
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
/* /*
* Definition of governor attribute flags except for common sysfs attributes * Definition of governor attribute flags except for common sysfs attributes
* - DEVFREQ_GOV_ATTR_POLLING_INTERVAL * - DEVFREQ_GOV_ATTR_POLLING_INTERVAL
* : Indicate polling_interal sysfs attribute * : Indicate polling_interval sysfs attribute
* - DEVFREQ_GOV_ATTR_TIMER * - DEVFREQ_GOV_ATTR_TIMER
* : Indicate timer sysfs attribute * : Indicate timer sysfs attribute
*/ */
......
...@@ -400,7 +400,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev) ...@@ -400,7 +400,7 @@ static int rk3399_dmcfreq_probe(struct platform_device *pdev)
default: default:
ret = -EINVAL; ret = -EINVAL;
goto err_edev; goto err_edev;
}; }
no_pmu: no_pmu:
arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0, arm_smccc_smc(ROCKCHIP_SIP_DRAM_FREQ, 0, 0,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment