Merge tag 'printk-for-5.10-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / drivers / cpufreq / s5pv210-cpufreq.c

diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c
index e84281e..bed496c 100644 (file)
--- a/drivers/cpufreq/s5pv210-cpufreq.c
+++ b/drivers/cpufreq/s5pv210-cpufreq.c
@@ -590,6 +590,7 @@ static struct notifier_block s5pv210_cpufreq_reboot_notifier = {
 
 static int s5pv210_cpufreq_probe(struct platform_device *pdev)
 {
+       struct device *dev = &pdev->dev;
        struct device_node *np;
        int id, result = 0;
 
@@ -602,28 +603,20 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev)
         * cpufreq-dt driver.
         */
        arm_regulator = regulator_get(NULL, "vddarm");
-       if (IS_ERR(arm_regulator)) {
-               if (PTR_ERR(arm_regulator) == -EPROBE_DEFER)
-                       pr_debug("vddarm regulator not ready, defer\n");
-               else
-                       pr_err("failed to get regulator vddarm\n");
-               return PTR_ERR(arm_regulator);
-       }
+       if (IS_ERR(arm_regulator))
+               return dev_err_probe(dev, PTR_ERR(arm_regulator),
+                                    "failed to get regulator vddarm\n");
 
        int_regulator = regulator_get(NULL, "vddint");
        if (IS_ERR(int_regulator)) {
-               if (PTR_ERR(int_regulator) == -EPROBE_DEFER)
-                       pr_debug("vddint regulator not ready, defer\n");
-               else
-                       pr_err("failed to get regulator vddint\n");
-               result = PTR_ERR(int_regulator);
+               result = dev_err_probe(dev, PTR_ERR(int_regulator),
+                                      "failed to get regulator vddint\n");
                goto err_int_regulator;
        }
 
        np = of_find_compatible_node(NULL, NULL, "samsung,s5pv210-clock");
        if (!np) {
-               pr_err("%s: failed to find clock controller DT node\n",
-                       __func__);
+               dev_err(dev, "failed to find clock controller DT node\n");
                result = -ENODEV;
                goto err_clock;
        }
@@ -631,7 +624,7 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev)
        clk_base = of_iomap(np, 0);
        of_node_put(np);
        if (!clk_base) {
-               pr_err("%s: failed to map clock registers\n", __func__);
+               dev_err(dev, "failed to map clock registers\n");
                result = -EFAULT;
                goto err_clock;
        }
@@ -639,8 +632,7 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev)
        for_each_compatible_node(np, NULL, "samsung,s5pv210-dmc") {
                id = of_alias_get_id(np, "dmc");
                if (id < 0 || id >= ARRAY_SIZE(dmc_base)) {
-                       pr_err("%s: failed to get alias of dmc node '%pOFn'\n",
-                               __func__, np);
+                       dev_err(dev, "failed to get alias of dmc node '%pOFn'\n", np);
                        of_node_put(np);
                        result = id;
                        goto err_clk_base;
@@ -648,8 +640,7 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev)
 
                dmc_base[id] = of_iomap(np, 0);
                if (!dmc_base[id]) {
-                       pr_err("%s: failed to map dmc%d registers\n",
-                               __func__, id);
+                       dev_err(dev, "failed to map dmc%d registers\n", id);
                        of_node_put(np);
                        result = -EFAULT;
                        goto err_dmc;
@@ -658,7 +649,7 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev)
 
        for (id = 0; id < ARRAY_SIZE(dmc_base); ++id) {
                if (!dmc_base[id]) {
-                       pr_err("%s: failed to find dmc%d node\n", __func__, id);
+                       dev_err(dev, "failed to find dmc%d node\n", id);
                        result = -ENODEV;
                        goto err_dmc;
                }