crypto: inside-secure - use the error handler for invalidation requests

This patch reworks the way invalidation request handlers handle the
result descriptor errors, to use the common error handling function.
This improves the drivers in terms of readability and maintainability.

Suggested-by: Ofer Heifetz <oferh@marvell.com>
Signed-off-by: Antoine Tenart <antoine.tenart@bootlin.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/inside-secure/safexcel_cipher.c b/drivers/crypto/inside-secure/safexcel_cipher.c
index 6bb60fd..5bc0afc 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel_cipher.c
+++ b/drivers/crypto/inside-secure/safexcel_cipher.c
@@ -491,11 +491,8 @@ static int safexcel_handle_inv_result(struct safexcel_crypto_priv *priv,
                        break;
                }
 
-               if (rdesc->result_data.error_code) {
-                       dev_err(priv->dev, "cipher: invalidate: result descriptor error (%d)\n",
-                               rdesc->result_data.error_code);
-                       *ret = -EIO;
-               }
+               if (likely(!*ret))
+                       *ret = safexcel_rdesc_check_errors(priv, rdesc);
 
                ndesc++;
        } while (!rdesc->last_seg);

diff --git a/drivers/crypto/inside-secure/safexcel_hash.c b/drivers/crypto/inside-secure/safexcel_hash.c
index c77b0e1..9c1ba7f 100644 (file)
--- a/drivers/crypto/inside-secure/safexcel_hash.c
+++ b/drivers/crypto/inside-secure/safexcel_hash.c
@@ -369,11 +369,8 @@ static int safexcel_handle_inv_result(struct safexcel_crypto_priv *priv,
                dev_err(priv->dev,
                        "hash: invalidate: could not retrieve the result descriptor\n");
                *ret = PTR_ERR(rdesc);
-       } else if (rdesc->result_data.error_code) {
-               dev_err(priv->dev,
-                       "hash: invalidate: result descriptor error (%d)\n",
-                       rdesc->result_data.error_code);
-               *ret = -EINVAL;
+       } else {
+               *ret = safexcel_rdesc_check_errors(priv, rdesc);
        }
 
        safexcel_complete(priv, ring);