Re: [PATCH v2 01/14] crypto: sun4i-ss - simplify optional reset handling

[Corentin Labbe]

On Wed, Mar 15, 2017 at 12:31:28PM +0100, Philipp Zabel wrote:
> As of commit bb475230b8e5 ("reset: make optional functions really
> optional"), the reset framework API calls use NULL pointers to describe
> optional, non-present reset controls.
> 
> This allows to return errors from devm_reset_control_get_optional and to
> call reset_control_(de)assert unconditionally.
> 
> Signed-off-by: Philipp Zabel 
> ---

Sorry for the delay
Acked-by: Corentin Labbe 

[PATCH v2 01/14] crypto: sun4i-ss - simplify optional reset handling

[Philipp Zabel]

As of commit bb475230b8e5 ("reset: make optional functions really
optional"), the reset framework API calls use NULL pointers to describe
optional, non-present reset controls.

This allows to return errors from devm_reset_control_get_optional and to
call reset_control_(de)assert unconditionally.

Signed-off-by: Philipp Zabel 
---
 drivers/crypto/sunxi-ss/sun4i-ss-core.c | 25 +++--
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/crypto/sunxi-ss/sun4i-ss-core.c 
b/drivers/crypto/sunxi-ss/sun4i-ss-core.c
index 3ac6c6c4ad18e..e310e311d23ea 100644
--- a/drivers/crypto/sunxi-ss/sun4i-ss-core.c
+++ b/drivers/crypto/sunxi-ss/sun4i-ss-core.c
@@ -258,10 +258,11 @@ static int sun4i_ss_probe(struct platform_device *pdev)
 
ss->reset = devm_reset_control_get_optional(>dev, "ahb");
if (IS_ERR(ss->reset)) {
-   if (PTR_ERR(ss->reset) == -EPROBE_DEFER)
-   return PTR_ERR(ss->reset);
-   dev_info(>dev, "no reset control found\n");
-   ss->reset = NULL;
+   err = PTR_ERR(ss->reset);
+   if (err == -EPROBE_DEFER)
+   return err;
+   dev_err(>dev, "Cannot get reset control err=%d\n", err);
+   return err;
}
 
/* Enable both clocks */
@@ -287,12 +288,10 @@ static int sun4i_ss_probe(struct platform_device *pdev)
}
 
/* Deassert reset if we have a reset control */
-   if (ss->reset) {
-   err = reset_control_deassert(ss->reset);
-   if (err) {
-   dev_err(>dev, "Cannot deassert reset control\n");
-   goto error_clk;
-   }
+   err = reset_control_deassert(ss->reset);
+   if (err) {
+   dev_err(>dev, "Cannot deassert reset control\n");
+   goto error_clk;
}
 
/*
@@ -372,8 +371,7 @@ static int sun4i_ss_probe(struct platform_device *pdev)
break;
}
}
-   if (ss->reset)
-   reset_control_assert(ss->reset);
+   reset_control_assert(ss->reset);
 error_clk:
clk_disable_unprepare(ss->ssclk);
 error_ssclk:
@@ -398,8 +396,7 @@ static int sun4i_ss_remove(struct platform_device *pdev)
}
 
writel(0, ss->base + SS_CTL);
-   if (ss->reset)
-   reset_control_assert(ss->reset);
+   reset_control_assert(ss->reset);
clk_disable_unprepare(ss->busclk);
clk_disable_unprepare(ss->ssclk);
return 0;
-- 
2.11.0