1 files changed, 17 insertions, 15 deletions

diff --git a/drivers/cpufreq/exynos-cpufreq.c b/drivers/cpufreq/exynos-cpufreq.c
index 348c8bafe436..1e0ec57bf6e3 100644
--- a/drivers/cpufreq/exynos-cpufreq.c
+++ b/drivers/cpufreq/exynos-cpufreq.c
@@ -28,17 +28,16 @@ static unsigned int locking_frequency;
 static int exynos_cpufreq_get_index(unsigned int freq)
 {
         struct cpufreq_frequency_table *freq_table = exynos_info->freq_table;
-        int index;
+        struct cpufreq_frequency_table *pos;
 
-        for (index = 0;
-                freq_table[index].frequency != CPUFREQ_TABLE_END; index++)
-                if (freq_table[index].frequency == freq)
+        cpufreq_for_each_entry(pos, freq_table)
+                if (pos->frequency == freq)
                         break;
 
-        if (freq_table[index].frequency == CPUFREQ_TABLE_END)
+        if (pos->frequency == CPUFREQ_TABLE_END)
                 return -EINVAL;
 
-        return index;
+        return pos - freq_table;
 }
 
 static int exynos_cpufreq_scale(unsigned int target_freq)
@@ -48,6 +47,7 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
         struct cpufreq_policy *policy = cpufreq_cpu_get(0);
         unsigned int arm_volt, safe_arm_volt = 0;
         unsigned int mpll_freq_khz = exynos_info->mpll_freq_khz;
+        struct device *dev = exynos_info->dev;
         unsigned int old_freq;
         int index, old_index;
         int ret = 0;
@@ -89,8 +89,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
                 /* Firstly, voltage up to increase frequency */
                 ret = regulator_set_voltage(arm_regulator, arm_volt, arm_volt);
                 if (ret) {
-                        pr_err("%s: failed to set cpu voltage to %d\n",
-                                __func__, arm_volt);
+                        dev_err(dev, "failed to set cpu voltage to %d\n",
+                                arm_volt);
                         return ret;
                 }
         }
@@ -99,8 +99,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
                 ret = regulator_set_voltage(arm_regulator, safe_arm_volt,
                                       safe_arm_volt);
                 if (ret) {
-                        pr_err("%s: failed to set cpu voltage to %d\n",
-                                __func__, safe_arm_volt);
+                        dev_err(dev, "failed to set cpu voltage to %d\n",
+                                safe_arm_volt);
                         return ret;
                 }
         }
@@ -114,8 +114,8 @@ static int exynos_cpufreq_scale(unsigned int target_freq)
                 ret = regulator_set_voltage(arm_regulator, arm_volt,
                                 arm_volt);
                 if (ret) {
-                        pr_err("%s: failed to set cpu voltage to %d\n",
-                                __func__, arm_volt);
+                        dev_err(dev, "failed to set cpu voltage to %d\n",
+                                arm_volt);
                         goto out;
                 }
         }
@@ -162,6 +162,8 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
         if (!exynos_info)
                 return -ENOMEM;
 
+        exynos_info->dev = &pdev->dev;
+
         if (of_machine_is_compatible("samsung,exynos4210")) {
                 exynos_info->type = EXYNOS_SOC_4210;
                 ret = exynos4210_cpufreq_init(exynos_info);
@@ -183,13 +185,13 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
                 goto err_vdd_arm;
 
         if (exynos_info->set_freq == NULL) {
-                pr_err("%s: No set_freq function (ERR)\n", __func__);
+                dev_err(&pdev->dev, "No set_freq function (ERR)\n");
                 goto err_vdd_arm;
         }
 
         arm_regulator = regulator_get(NULL, "vdd_arm");
         if (IS_ERR(arm_regulator)) {
-                pr_err("%s: failed to get resource vdd_arm\n", __func__);
+                dev_err(&pdev->dev, "failed to get resource vdd_arm\n");
                 goto err_vdd_arm;
         }
 
@@ -199,7 +201,7 @@ static int exynos_cpufreq_probe(struct platform_device *pdev)
         if (!cpufreq_register_driver(&exynos_driver))
                 return 0;
 
-        pr_err("%s: failed to register cpufreq driver\n", __func__);
+        dev_err(&pdev->dev, "failed to register cpufreq driver\n");
         regulator_put(arm_regulator);
 err_vdd_arm:
         kfree(exynos_info);