Merge tag 'timers-urgent-2020-02-09' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / drivers / power / avs / qcom-cpr.c

diff --git a/drivers/power/avs/qcom-cpr.c b/drivers/power/avs/qcom-cpr.c
index 9192fb7..bd7c3e4 100644 (file)
--- a/drivers/power/avs/qcom-cpr.c
+++ b/drivers/power/avs/qcom-cpr.c
@@ -517,7 +517,7 @@ static int cpr_scale(struct cpr_drv *drv, enum voltage_change_dir dir)
                dev_dbg(drv->dev,
                        "UP: -> new_uV: %d last_uV: %d perf state: %u\n",
                        new_uV, last_uV, cpr_get_cur_perf_state(drv));
-       } else if (dir == DOWN) {
+       } else {
                if (desc->clamp_timer_interval &&
                    error_steps < desc->down_threshold) {
                        /*
@@ -567,7 +567,7 @@ static int cpr_scale(struct cpr_drv *drv, enum voltage_change_dir dir)
                /* Disable auto nack down */
                reg_mask = RBCPR_CTL_SW_AUTO_CONT_NACK_DN_EN;
                val = 0;
-       } else if (dir == DOWN) {
+       } else {
                /* Restore default threshold for UP */
                reg_mask = RBCPR_CTL_UP_THRESHOLD_MASK;
                reg_mask <<= RBCPR_CTL_UP_THRESHOLD_SHIFT;
@@ -1547,8 +1547,6 @@ static int cpr_pd_attach_dev(struct generic_pm_domain *domain,
                goto unlock;
        }
 
-       dev_dbg(drv->dev, "number of OPPs: %d\n", drv->num_corners);
-
        drv->corners = devm_kcalloc(drv->dev, drv->num_corners,
                                    sizeof(*drv->corners),
                                    GFP_KERNEL);
@@ -1586,6 +1584,9 @@ static int cpr_pd_attach_dev(struct generic_pm_domain *domain,
                                   acc_desc->enable_mask,
                                   acc_desc->enable_mask);
 
+       dev_info(drv->dev, "driver initialized with %u OPPs\n",
+                drv->num_corners);
+
 unlock:
        mutex_unlock(&drv->lock);