watchdog: cadence: Simplify with dev_err_probe()
Re: [PATCH 2/3] watchdog: davinci: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Quoted 27 lines
--- drivers/watchdog/davinci_wdt.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/watchdog/davinci_wdt.c +3
-6@@ -206,12 +206,9 @@ static int davinci_wdt_probe(struct platform_device *pdev)return -ENOMEM ; davinci_wdt->clk =devm_clk_get (dev,NULL ); - -if (IS_ERR (davinci_wdt->clk)) { -if (PTR_ERR (davinci_wdt->clk) != -EPROBE_DEFER ) -dev_err (dev,"failed to get clock node\n" ); -return PTR_ERR (davinci_wdt->clk); - } +if (IS_ERR (davinci_wdt->clk)) +return dev_err_probe (dev,PTR_ERR (davinci_wdt->clk), +"failed to get clock node\n" ); ret =clk_prepare_enable (davinci_wdt->clk);if (ret) {Signature · 1 line
2.17.1
Re: [PATCH 3/3] watchdog: rti: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Quoted 43 lines
---
It is unusual to expect deferred probe from
pm_runtime_get()...--- drivers/watchdog/rti_wdt.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)drivers/watchdog/rti_wdt.c +4
-10@@ -205,11 +205,8 @@ static int rti_wdt_probe(struct platform_device *pdev)return -ENOMEM ; clk =clk_get (dev,NULL ); -if (IS_ERR (clk)) { -if (PTR_ERR (clk) != -EPROBE_DEFER ) -dev_err (dev,"failed to get clock\n" ); -return PTR_ERR (clk); - } +if (IS_ERR (clk)) +return dev_err_probe (dev,PTR_ERR (clk),"failed to get clock\n" ); wdt->freq =clk_get_rate (clk);@@ -230,11 +227,8 @@ static int rti_wdt_probe(struct platform_device *pdev)pm_runtime_enable (dev); ret =pm_runtime_get_sync (dev); -if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (&pdev->dev,"runtime pm failed\n" ); -return ret; - } +if (ret) +return dev_err_probe (dev, ret,"runtime pm failed\n" );platform_set_drvdata (pdev, wdt);Signature · 1 line
2.17.1
Quoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Quoted 27 lines
--- drivers/watchdog/cadence_wdt.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/watchdog/cadence_wdt.c +3
-6@@ -334,12 +334,9 @@ static int cdns_wdt_probe(struct platform_device *pdev)watchdog_set_drvdata (cdns_wdt_device, wdt); wdt->clk =devm_clk_get (dev,NULL ); -if (IS_ERR (wdt->clk)) { - ret =PTR_ERR (wdt->clk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"input clock not found\n" ); -return ret; - } +if (IS_ERR (wdt->clk)) +return dev_err_probe (dev,PTR_ERR (wdt->clk), +"input clock not found\n" ); ret =clk_prepare_enable (wdt->clk);if (ret) {Signature · 1 line
2.17.1
PATCH 3/3 watchdog: rti: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
---
It is unusual to expect deferred probe from pm_runtime_get()...
--- drivers/watchdog/rti_wdt.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)
drivers/watchdog/rti_wdt.c +4 -10
@@ -205,11 +205,8 @@ static int rti_wdt_probe(struct platform_device *pdev)return -ENOMEM ; clk =clk_get (dev,NULL ); -if (IS_ERR (clk)) { -if (PTR_ERR (clk) != -EPROBE_DEFER ) -dev_err (dev,"failed to get clock\n" ); -return PTR_ERR (clk); - } +if (IS_ERR (clk)) +return dev_err_probe (dev,PTR_ERR (clk),"failed to get clock\n" ); wdt->freq =clk_get_rate (clk);
@@ -230,11 +227,8 @@ static int rti_wdt_probe(struct platform_device *pdev)pm_runtime_enable (dev); ret =pm_runtime_get_sync (dev); -if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (&pdev->dev,"runtime pm failed\n" ); -return ret; - } +if (ret) +return dev_err_probe (dev, ret,"runtime pm failed\n" );platform_set_drvdata (pdev, wdt);
Signature · 1 line
2.17.1
PATCH 2/3 watchdog: davinci: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiCommon pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
--- drivers/watchdog/davinci_wdt.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/watchdog/davinci_wdt.c +3 -6
@@ -206,12 +206,9 @@ static int davinci_wdt_probe(struct platform_device *pdev)return -ENOMEM ; davinci_wdt->clk =devm_clk_get (dev,NULL ); - -if (IS_ERR (davinci_wdt->clk)) { -if (PTR_ERR (davinci_wdt->clk) != -EPROBE_DEFER ) -dev_err (dev,"failed to get clock node\n" ); -return PTR_ERR (davinci_wdt->clk); - } +if (IS_ERR (davinci_wdt->clk)) +return dev_err_probe (dev,PTR_ERR (davinci_wdt->clk), +"failed to get clock node\n" ); ret =clk_prepare_enable (davinci_wdt->clk);if (ret) {
Signature · 1 line
2.17.1
PATCH 1/3 watchdog: cadence: Simplify with dev_err_probe()
Common pattern of handling deferred probe can be simplified with dev_err_probe(). Less code and the error value gets printed.
--- drivers/watchdog/cadence_wdt.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/watchdog/cadence_wdt.c +3 -6
@@ -334,12 +334,9 @@ static int cdns_wdt_probe(struct platform_device *pdev)watchdog_set_drvdata (cdns_wdt_device, wdt); wdt->clk =devm_clk_get (dev,NULL ); -if (IS_ERR (wdt->clk)) { - ret =PTR_ERR (wdt->clk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"input clock not found\n" ); -return ret; - } +if (IS_ERR (wdt->clk)) +return dev_err_probe (dev,PTR_ERR (wdt->clk), +"input clock not found\n" ); ret =clk_prepare_enable (wdt->clk);if (ret) {
Signature · 1 line
2.17.1
Quoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Hmm, I had replied to this but I don't see it on patchwork. Trying again.
Guenter
Quoted 27 lines
--- drivers/watchdog/cadence_wdt.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/watchdog/cadence_wdt.c +3
-6@@ -334,12 +334,9 @@ static int cdns_wdt_probe(struct platform_device *pdev)watchdog_set_drvdata (cdns_wdt_device, wdt); wdt->clk =devm_clk_get (dev,NULL ); -if (IS_ERR (wdt->clk)) { - ret =PTR_ERR (wdt->clk); -if (ret != -EPROBE_DEFER ) -dev_err (dev,"input clock not found\n" ); -return ret; - } +if (IS_ERR (wdt->clk)) +return dev_err_probe (dev,PTR_ERR (wdt->clk), +"input clock not found\n" ); ret =clk_prepare_enable (wdt->clk);if (ret) {Signature · 1 line
2.17.1
Re: [PATCH 2/3] watchdog: davinci: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Quoted 27 lines
--- drivers/watchdog/davinci_wdt.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/watchdog/davinci_wdt.c +3
-6@@ -206,12 +206,9 @@ static int davinci_wdt_probe(struct platform_device *pdev)return -ENOMEM ; davinci_wdt->clk =devm_clk_get (dev,NULL ); - -if (IS_ERR (davinci_wdt->clk)) { -if (PTR_ERR (davinci_wdt->clk) != -EPROBE_DEFER ) -dev_err (dev,"failed to get clock node\n" ); -return PTR_ERR (davinci_wdt->clk); - } +if (IS_ERR (davinci_wdt->clk)) +return dev_err_probe (dev,PTR_ERR (davinci_wdt->clk), +"failed to get clock node\n" ); ret =clk_prepare_enable (davinci_wdt->clk);if (ret) {Signature · 1 line
2.17.1
Re: [PATCH 3/3] watchdog: rti: Simplify with dev_err_probe()
In reply to Krzysztof KozlowskiQuoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>
Quoted 43 lines
---
It is unusual to expect deferred probe from
pm_runtime_get()...--- drivers/watchdog/rti_wdt.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)drivers/watchdog/rti_wdt.c +4
-10@@ -205,11 +205,8 @@ static int rti_wdt_probe(struct platform_device *pdev)return -ENOMEM ; clk =clk_get (dev,NULL ); -if (IS_ERR (clk)) { -if (PTR_ERR (clk) != -EPROBE_DEFER ) -dev_err (dev,"failed to get clock\n" ); -return PTR_ERR (clk); - } +if (IS_ERR (clk)) +return dev_err_probe (dev,PTR_ERR (clk),"failed to get clock\n" ); wdt->freq =clk_get_rate (clk);@@ -230,11 +227,8 @@ static int rti_wdt_probe(struct platform_device *pdev)pm_runtime_enable (dev); ret =pm_runtime_get_sync (dev); -if (ret) { -if (ret != -EPROBE_DEFER ) -dev_err (&pdev->dev,"runtime pm failed\n" ); -return ret; - } +if (ret) +return dev_err_probe (dev, ret,"runtime pm failed\n" );platform_set_drvdata (pdev, wdt);Signature · 1 line
2.17.1
Quoted 7 lines · Guenter Roeck
Quoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>Reviewed-by Guenter Roeck <[email protected]>
Thanks for the review. Who could pick up these patches?
Best regards,
Krzysztof
Guenter Roeck
maintainerQuoted 11 lines · Krzysztof Kozlowski
Quoted 7 lines · Guenter Roeck
Quoted 4 lines · Krzysztof Kozlowski
Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and the error value gets printed.Signed-off-by Krzysztof Kozlowski <[email protected]>Reviewed-by Guenter Roeck <[email protected]>Thanks for the review. Who could pick up these patches?
They are queued up in my watchdog-next branch, and Wim usually picks up patches from there.
Guenter