Skip to contentSkip to conversation

crypto: caam - use traditional error check pattern

PATCH In review Andy Shevchenko 3 participants 3 messages Aug 31, 2020 – Sep 11, 2020

Subsystems (2)
Crypto API Freescale CAAM (Cryptographic Acceleration and Assurance Module) driver
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 crypto: caam - use traditional error check pattern

Use traditional error check pattern

	ret = ...;
	if (ret)
		return ret;
	...

instead of checking error code to be 0.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/crypto/caam/ctrl.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/crypto/caam/ctrl.c +3 -4
index 65de57f169d9..25785404a58e 100644
@@ -333,11 +333,10 @@ static int instantiate_rng(struct device *ctrldev, int state_handle_mask,
 
 	kfree(desc);
 
-	if (!ret)
-		ret = devm_add_action_or_reset(ctrldev, devm_deinstantiate_rng,
-					       ctrldev);
+	if (ret)
+		return ret;
 
-	return ret;
+	return devm_add_action_or_reset(ctrldev, devm_deinstantiate_rng, ctrldev);
 }
 
 /*
Signature · 1 line
2.28.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Andy Shevchenko

Use traditional error check pattern

	ret = ...;
	if (ret)
		return ret;
	...

instead of checking error code to be 0.

Signed-off-by Andy Shevchenko <[email protected]>
Reviewed-by Iuliana Prodan <[email protected]>
Quoted 24 lines
---
  drivers/crypto/caam/ctrl.c | 7 +++----
  1 file changed, 3 insertions(+), 4 deletions(-)
drivers/crypto/caam/ctrl.c +3 -4
index 65de57f169d9..25785404a58e 100644
@@ -333,11 +333,10 @@ static int instantiate_rng(struct device *ctrldev, int state_handle_mask,
 
  	kfree(desc);
 
-	if (!ret)
-		ret = devm_add_action_or_reset(ctrldev, devm_deinstantiate_rng,
-					       ctrldev);
+	if (ret)
+		return ret;
 
-	return ret;
+	return devm_add_action_or_reset(ctrldev, devm_deinstantiate_rng, ctrldev);
  }
 
  /*
maintainer
#2 lore raw
In reply to Andy Shevchenko
Quoted 11 lines · Andy Shevchenko

Use traditional error check pattern

       ret = ...;
       if (ret)
               return ret;
       ...

instead of checking error code to be 0.

Signed-off-by Andy Shevchenko <[email protected]>

---
drivers/crypto/caam/ctrl.c | 7 +++----

1 file changed, 3 insertions(+), 4 deletions(-)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt