lkml.org 
[lkml]   [2022]   [Apr]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH V2 15/15] cpufreq: mediatek: Use device print to show logs
    Date
    Replace pr_* with dev_* to show logs.

    Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com>
    ---
    drivers/cpufreq/mediatek-cpufreq.c | 41 +++++++++++++++++-------------
    1 file changed, 23 insertions(+), 18 deletions(-)

    diff --git a/drivers/cpufreq/mediatek-cpufreq.c b/drivers/cpufreq/mediatek-cpufreq.c
    index 07d3b31e3ee0..34e3baa4927f 100644
    --- a/drivers/cpufreq/mediatek-cpufreq.c
    +++ b/drivers/cpufreq/mediatek-cpufreq.c
    @@ -92,13 +92,15 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info,

    old_vproc = regulator_get_voltage(proc_reg);
    if (old_vproc < 0) {
    - pr_err("%s: invalid Vproc value: %d\n", __func__, old_vproc);
    + dev_err(info->cpu_dev,
    + "%s: invalid Vproc value: %d\n", __func__, old_vproc);
    return old_vproc;
    }

    old_vsram = regulator_get_voltage(sram_reg);
    if (old_vsram < 0) {
    - pr_err("%s: invalid Vsram value: %d\n", __func__, old_vsram);
    + dev_err(info->cpu_dev,
    + "%s: invalid Vsram value: %d\n", __func__, old_vsram);
    return old_vsram;
    }

    @@ -217,8 +219,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
    freq_hz = freq_table[index].frequency * 1000;
    opp = dev_pm_opp_find_freq_ceil(cpu_dev, &freq_hz);
    if (IS_ERR(opp)) {
    - pr_err("cpu%d: failed to find OPP for %ld\n",
    - policy->cpu, freq_hz);
    + dev_err(cpu_dev, "cpu%d: failed to find OPP for %ld\n",
    + policy->cpu, freq_hz);
    return PTR_ERR(opp);
    }
    vproc = dev_pm_opp_get_voltage(opp);
    @@ -243,8 +245,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
    if (old_vproc <= target_vproc) {
    ret = mtk_cpufreq_set_voltage(info, target_vproc);
    if (ret) {
    - pr_err("cpu%d: failed to scale up voltage!\n",
    - policy->cpu);
    + dev_err(cpu_dev, "cpu%d: failed to scale up voltage!\n",
    + policy->cpu);
    mtk_cpufreq_set_voltage(info, old_vproc);
    goto out;
    }
    @@ -253,8 +255,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
    /* Reparent the CPU clock to intermediate clock. */
    ret = clk_set_parent(cpu_clk, info->inter_clk);
    if (ret) {
    - pr_err("cpu%d: failed to re-parent cpu clock!\n",
    - policy->cpu);
    + dev_err(cpu_dev, "cpu%d: failed to re-parent cpu clock!\n",
    + policy->cpu);
    mtk_cpufreq_set_voltage(info, old_vproc);
    goto out;
    }
    @@ -262,8 +264,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
    /* Set the original PLL to target rate. */
    ret = clk_set_rate(armpll, freq_hz);
    if (ret) {
    - pr_err("cpu%d: failed to scale cpu clock rate!\n",
    - policy->cpu);
    + dev_err(cpu_dev, "cpu%d: failed to scale cpu clock rate!\n",
    + policy->cpu);
    clk_set_parent(cpu_clk, armpll);
    mtk_cpufreq_set_voltage(info, old_vproc);
    goto out;
    @@ -272,8 +274,8 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
    /* Set parent of CPU clock back to the original PLL. */
    ret = clk_set_parent(cpu_clk, armpll);
    if (ret) {
    - pr_err("cpu%d: failed to re-parent cpu clock!\n",
    - policy->cpu);
    + dev_err(cpu_dev, "cpu%d: failed to re-parent cpu clock!\n",
    + policy->cpu);
    mtk_cpufreq_set_voltage(info, inter_vproc);
    goto out;
    }
    @@ -285,8 +287,9 @@ static int mtk_cpufreq_set_target(struct cpufreq_policy *policy,
    if (vproc < inter_vproc || vproc < old_vproc) {
    ret = mtk_cpufreq_set_voltage(info, vproc);
    if (ret) {
    - pr_err("cpu%d: failed to scale down voltage!\n",
    - policy->cpu);
    + dev_err(cpu_dev,
    + "cpu%d: failed to scale down voltage!\n",
    + policy->cpu);
    clk_set_parent(cpu_clk, info->inter_clk);
    clk_set_rate(armpll, old_freq_hz);
    clk_set_parent(cpu_clk, armpll);
    @@ -568,15 +571,17 @@ static int mtk_cpufreq_init(struct cpufreq_policy *policy)

    info = mtk_cpu_dvfs_info_lookup(policy->cpu);
    if (!info) {
    - pr_err("dvfs info for cpu%d is not initialized.\n",
    - policy->cpu);
    + dev_err(info->cpu_dev,
    + "dvfs info for cpu%d is not initialized.\n",
    + policy->cpu);
    return -EINVAL;
    }

    ret = dev_pm_opp_init_cpufreq_table(info->cpu_dev, &freq_table);
    if (ret) {
    - pr_err("failed to init cpufreq table for cpu%d: %d\n",
    - policy->cpu, ret);
    + dev_err(info->cpu_dev,
    + "failed to init cpufreq table for cpu%d: %d\n",
    + policy->cpu, ret);
    return ret;
    }

    --
    2.18.0
    \
     
     \ /
      Last update: 2022-04-08 07:01    [W:4.096 / U:0.576 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site