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

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

diff --git a/drivers/devfreq/devfreq.c b/drivers/devfreq/devfreq.c
index 6aa10de792b33060cd9840c471d62c8f9e87737f..94cc25fd68dadc99085f5195d29e98e01e1f6e5c 100644 (file)
--- a/drivers/devfreq/devfreq.c
+++ b/drivers/devfreq/devfreq.c
@@ -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;

diff --git a/drivers/devfreq/governor.h b/drivers/devfreq/governor.h
index 2a52f97b542db259f739783818d9c83e204c1788..70f44b3ca42e60c2aa5cc6b440ff38846c350cb9 100644 (file)
--- a/drivers/devfreq/governor.h
+++ b/drivers/devfreq/governor.h
@@ -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
  */

diff --git a/drivers/devfreq/rk3399_dmc.c b/drivers/devfreq/rk3399_dmc.c
index 2e912166a9934f166cb2b165c397fb30628fb7e2..9e9d3b4c6d48c3169d2949084d68527e7e61ce6b 100644 (file)
--- a/drivers/devfreq/rk3399_dmc.c
+++ b/drivers/devfreq/rk3399_dmc.c
@@ -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,