crypto: use ERR_CAST

Replace PTR_ERR followed by ERR_PTR by ERR_CAST, to be more concise.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression err,x;
@@
-       err = PTR_ERR(x);
        if (IS_ERR(x))
-                return ERR_PTR(err);
+                return ERR_CAST(x);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

1 files changed, 7 insertions, 16 deletions

diff --git a/crypto/ccm.c b/crypto/ccm.c
index 32fe1bb5decb..499c91717d93 100644
--- a/crypto/ccm.c
+++ b/crypto/ccm.c
@@ -484,18 +484,16 @@ static struct crypto_instance *crypto_ccm_alloc_common(struct rtattr **tb,
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
                 return ERR_PTR(-EINVAL);
 
         cipher = crypto_alg_mod_lookup(cipher_name,  CRYPTO_ALG_TYPE_CIPHER,
                                        CRYPTO_ALG_TYPE_MASK);
-        err = PTR_ERR(cipher);
         if (IS_ERR(cipher))
-                return ERR_PTR(err);
+                return ERR_CAST(cipher);
 
         err = -EINVAL;
         if (cipher->cra_blocksize != 16)
@@ -573,15 +571,13 @@ out_put_cipher:
 
 static struct crypto_instance *crypto_ccm_alloc(struct rtattr **tb)
 {
-        int err;
         const char *cipher_name;
         char ctr_name[CRYPTO_MAX_ALG_NAME];
         char full_name[CRYPTO_MAX_ALG_NAME];
 
         cipher_name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(cipher_name);
         if (IS_ERR(cipher_name))
-                return ERR_PTR(err);
+                return ERR_CAST(cipher_name);
 
         if (snprintf(ctr_name, CRYPTO_MAX_ALG_NAME, "ctr(%s)",
                      cipher_name) >= CRYPTO_MAX_ALG_NAME)
@@ -612,20 +608,17 @@ static struct crypto_template crypto_ccm_tmpl = {
 
 static struct crypto_instance *crypto_ccm_base_alloc(struct rtattr **tb)
 {
-        int err;
         const char *ctr_name;
         const char *cipher_name;
         char full_name[CRYPTO_MAX_ALG_NAME];
 
         ctr_name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(ctr_name);
         if (IS_ERR(ctr_name))
-                return ERR_PTR(err);
+                return ERR_CAST(ctr_name);
 
         cipher_name = crypto_attr_alg_name(tb[2]);
-        err = PTR_ERR(cipher_name);
         if (IS_ERR(cipher_name))
-                return ERR_PTR(err);
+                return ERR_CAST(cipher_name);
 
         if (snprintf(full_name, CRYPTO_MAX_ALG_NAME, "ccm_base(%s,%s)",
                      ctr_name, cipher_name) >= CRYPTO_MAX_ALG_NAME)
@@ -760,17 +753,15 @@ static struct crypto_instance *crypto_rfc4309_alloc(struct rtattr **tb)
         int err;
 
         algt = crypto_get_attr_type(tb);
-        err = PTR_ERR(algt);
         if (IS_ERR(algt))
-                return ERR_PTR(err);
+                return ERR_CAST(algt);
 
         if ((algt->type ^ CRYPTO_ALG_TYPE_AEAD) & algt->mask)
                 return ERR_PTR(-EINVAL);
 
         ccm_name = crypto_attr_alg_name(tb[1]);
-        err = PTR_ERR(ccm_name);
         if (IS_ERR(ccm_name))
-                return ERR_PTR(err);
+                return ERR_CAST(ccm_name);
 
         inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
         if (!inst)