* [PATCH 1/2] cpufreq: s5pv210: Simplify with dev_err_probe() @ 2020-08-26 16:00 Krzysztof Kozlowski 2020-08-26 16:00 ` [PATCH 2/2] cpufreq: s5pv210: Use dev_err instead of pr_err in probe Krzysztof Kozlowski 0 siblings, 1 reply; 3+ messages in thread From: Krzysztof Kozlowski @ 2020-08-26 16:00 UTC (permalink / raw) To: Rafael J. Wysocki, Viresh Kumar, Kukjin Kim, Krzysztof Kozlowski, linux-pm, linux-arm-kernel, linux-samsung-soc, linux-kernel Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and also it prints the error value. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- drivers/cpufreq/s5pv210-cpufreq.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c index e84281e2561d..7dccdb364fcf 100644 --- 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,21 +603,14 @@ 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; } -- 2.17.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] cpufreq: s5pv210: Use dev_err instead of pr_err in probe 2020-08-26 16:00 [PATCH 1/2] cpufreq: s5pv210: Simplify with dev_err_probe() Krzysztof Kozlowski @ 2020-08-26 16:00 ` Krzysztof Kozlowski 2020-08-31 4:29 ` Viresh Kumar 0 siblings, 1 reply; 3+ messages in thread From: Krzysztof Kozlowski @ 2020-08-26 16:00 UTC (permalink / raw) To: Rafael J. Wysocki, Viresh Kumar, Kukjin Kim, Krzysztof Kozlowski, linux-pm, linux-arm-kernel, linux-samsung-soc, linux-kernel dev_err() allows easily to identify the device printing the message so no need for __func__. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- drivers/cpufreq/s5pv210-cpufreq.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c index 7dccdb364fcf..911a655895d8 100644 --- a/drivers/cpufreq/s5pv210-cpufreq.c +++ b/drivers/cpufreq/s5pv210-cpufreq.c @@ -616,8 +616,7 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev) 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; } @@ -625,16 +624,14 @@ 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__); - result = -EFAULT; + dev_err(dev, "failed to map clock registers\n"); goto err_clock; } 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; @@ -642,8 +639,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; @@ -652,7 +648,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; } -- 2.17.1 ^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 2/2] cpufreq: s5pv210: Use dev_err instead of pr_err in probe 2020-08-26 16:00 ` [PATCH 2/2] cpufreq: s5pv210: Use dev_err instead of pr_err in probe Krzysztof Kozlowski @ 2020-08-31 4:29 ` Viresh Kumar 0 siblings, 0 replies; 3+ messages in thread From: Viresh Kumar @ 2020-08-31 4:29 UTC (permalink / raw) To: Krzysztof Kozlowski Cc: Rafael J. Wysocki, Kukjin Kim, linux-pm, linux-arm-kernel, linux-samsung-soc, linux-kernel On 26-08-20, 18:00, Krzysztof Kozlowski wrote: > dev_err() allows easily to identify the device printing the message so > no need for __func__. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > --- > drivers/cpufreq/s5pv210-cpufreq.c | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/drivers/cpufreq/s5pv210-cpufreq.c b/drivers/cpufreq/s5pv210-cpufreq.c > index 7dccdb364fcf..911a655895d8 100644 > --- a/drivers/cpufreq/s5pv210-cpufreq.c > +++ b/drivers/cpufreq/s5pv210-cpufreq.c > @@ -616,8 +616,7 @@ static int s5pv210_cpufreq_probe(struct platform_device *pdev) > > 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; > } > @@ -625,16 +624,14 @@ 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__); > - result = -EFAULT; I have restored this back as it didn't look intentional. Applied both. Thanks. -- viresh ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-08-31 4:29 UTC | newest] Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2020-08-26 16:00 [PATCH 1/2] cpufreq: s5pv210: Simplify with dev_err_probe() Krzysztof Kozlowski 2020-08-26 16:00 ` [PATCH 2/2] cpufreq: s5pv210: Use dev_err instead of pr_err in probe Krzysztof Kozlowski 2020-08-31 4:29 ` Viresh Kumar
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).