]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
PM / devfreq: Init user limits from OPP limits, not viceversa
authorMatthias Kaehlcke <mka@chromium.org>
Fri, 25 May 2018 20:30:33 +0000 (13:30 -0700)
committerMyungJoo Ham <myungjoo.ham@samsung.com>
Wed, 18 Jul 2018 04:58:38 +0000 (13:58 +0900)
Commit ab8f58ad72c4 ("PM / devfreq: Set min/max_freq when adding
the devfreq device") introduced the initialization of the user
limits min/max_freq from the lowest/highest available OPPs. Later
commit f1d981eaecf8 ("PM / devfreq: Use the available min/max
frequency") added scaling_min/max_freq, which actually represent
the frequencies of the lowest/highest available OPP. scaling_min/
max_freq are initialized with the values from min/max_freq, which
is totally correct in the context, but a bit awkward to read.

Swap the initialization and assign scaling_min/max_freq with the
OPP freqs and then the user limts min/max_freq with scaling_min/
max_freq.

Needless to say that this change is a NOP, intended to improve
readability.

Signed-off-by: Matthias Kaehlcke <mka@chromium.org>
Reviewed-by: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Brian Norris <briannorris@chromium.org>
Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
drivers/devfreq/devfreq.c

index e26adf67e218d6d4e7a6a31cc86da55ea5ad4ebc..4c49bb1330b527ecb443536f6d1109f1dee2aa66 100644 (file)
@@ -604,21 +604,21 @@ struct devfreq *devfreq_add_device(struct device *dev,
                mutex_lock(&devfreq->lock);
        }
 
-       devfreq->min_freq = find_available_min_freq(devfreq);
-       if (!devfreq->min_freq) {
+       devfreq->scaling_min_freq = find_available_min_freq(devfreq);
+       if (!devfreq->scaling_min_freq) {
                mutex_unlock(&devfreq->lock);
                err = -EINVAL;
                goto err_dev;
        }
-       devfreq->scaling_min_freq = devfreq->min_freq;
+       devfreq->min_freq = devfreq->scaling_min_freq;
 
-       devfreq->max_freq = find_available_max_freq(devfreq);
-       if (!devfreq->max_freq) {
+       devfreq->scaling_max_freq = find_available_max_freq(devfreq);
+       if (!devfreq->scaling_max_freq) {
                mutex_unlock(&devfreq->lock);
                err = -EINVAL;
                goto err_dev;
        }
-       devfreq->scaling_max_freq = devfreq->max_freq;
+       devfreq->max_freq = devfreq->scaling_max_freq;
 
        dev_set_name(&devfreq->dev, "devfreq%d",
                                atomic_inc_return(&devfreq_no));