Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cpufreq: exynos: Use dev_err/info function instead of pr_err/info

This patch uses dev_err/info function to show accurate log message
with device name instead of pr_err/info function.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

authored by

Chanwoo Choi and committed by
Rafael J. Wysocki
e5eaa445 89d4f82a

+13 -9
+12 -9
drivers/cpufreq/exynos-cpufreq.c
··· 48 48 struct cpufreq_policy *policy = cpufreq_cpu_get(0); 49 49 unsigned int arm_volt, safe_arm_volt = 0; 50 50 unsigned int mpll_freq_khz = exynos_info->mpll_freq_khz; 51 + struct device *dev = exynos_info->dev; 51 52 unsigned int old_freq; 52 53 int index, old_index; 53 54 int ret = 0; ··· 90 89 /* Firstly, voltage up to increase frequency */ 91 90 ret = regulator_set_voltage(arm_regulator, arm_volt, arm_volt); 92 91 if (ret) { 93 - pr_err("%s: failed to set cpu voltage to %d\n", 94 - __func__, arm_volt); 92 + dev_err(dev, "failed to set cpu voltage to %d\n", 93 + arm_volt); 95 94 return ret; 96 95 } 97 96 } ··· 100 99 ret = regulator_set_voltage(arm_regulator, safe_arm_volt, 101 100 safe_arm_volt); 102 101 if (ret) { 103 - pr_err("%s: failed to set cpu voltage to %d\n", 104 - __func__, safe_arm_volt); 102 + dev_err(dev, "failed to set cpu voltage to %d\n", 103 + safe_arm_volt); 105 104 return ret; 106 105 } 107 106 } ··· 115 114 ret = regulator_set_voltage(arm_regulator, arm_volt, 116 115 arm_volt); 117 116 if (ret) { 118 - pr_err("%s: failed to set cpu voltage to %d\n", 119 - __func__, arm_volt); 117 + dev_err(dev, "failed to set cpu voltage to %d\n", 118 + arm_volt); 120 119 goto out; 121 120 } 122 121 } ··· 163 162 if (!exynos_info) 164 163 return -ENOMEM; 165 164 165 + exynos_info->dev = &pdev->dev; 166 + 166 167 if (soc_is_exynos4210()) 167 168 ret = exynos4210_cpufreq_init(exynos_info); 168 169 else if (soc_is_exynos4212() || soc_is_exynos4412()) ··· 178 175 goto err_vdd_arm; 179 176 180 177 if (exynos_info->set_freq == NULL) { 181 - pr_err("%s: No set_freq function (ERR)\n", __func__); 178 + dev_err(&pdev->dev, "No set_freq function (ERR)\n"); 182 179 goto err_vdd_arm; 183 180 } 184 181 185 182 arm_regulator = regulator_get(NULL, "vdd_arm"); 186 183 if (IS_ERR(arm_regulator)) { 187 - pr_err("%s: failed to get resource vdd_arm\n", __func__); 184 + dev_err(&pdev->dev, "failed to get resource vdd_arm\n"); 188 185 goto err_vdd_arm; 189 186 } 190 187 ··· 194 191 if (!cpufreq_register_driver(&exynos_driver)) 195 192 return 0; 196 193 197 - pr_err("%s: failed to register cpufreq driver\n", __func__); 194 + dev_err(&pdev->dev, "failed to register cpufreq driver\n"); 198 195 regulator_put(arm_regulator); 199 196 err_vdd_arm: 200 197 kfree(exynos_info);
+1
drivers/cpufreq/exynos-cpufreq.h
··· 34 34 }; 35 35 36 36 struct exynos_dvfs_info { 37 + struct device *dev; 37 38 unsigned long mpll_freq_khz; 38 39 unsigned int pll_safe_idx; 39 40 struct clk *cpu_clk;