summaryrefslogtreecommitdiffstats
path: root/crypto/blkcipher.c
diff options
context:
space:
mode:
authorJulia Lawall <Julia.Lawall@lip6.fr>2013-01-22 12:29:26 +0100
committerHerbert Xu <herbert@gondor.apana.org.au>2013-02-04 14:16:53 +0100
commit3e8afe35c36fa0e928e038667709966a71a9cfa5 (patch)
treeb74592dd4ec5e9fdcb89abf82374ecd9cd2e89b8 /crypto/blkcipher.c
parentcrypto: atmel-aes - adjust duplicate test (diff)
downloadlinux-3e8afe35c36fa0e928e038667709966a71a9cfa5.tar.xz
linux-3e8afe35c36fa0e928e038667709966a71a9cfa5.zip
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>
Diffstat (limited to 'crypto/blkcipher.c')
-rw-r--r--crypto/blkcipher.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/crypto/blkcipher.c b/crypto/blkcipher.c
index a8d85a1d670e..e9e7244d5ef5 100644
--- a/crypto/blkcipher.c
+++ b/crypto/blkcipher.c
@@ -588,18 +588,16 @@ struct crypto_instance *skcipher_geniv_alloc(struct crypto_template *tmpl,
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_GIVCIPHER | CRYPTO_ALG_GENIV)) &
algt->mask)
return ERR_PTR(-EINVAL);
name = crypto_attr_alg_name(tb[1]);
- err = PTR_ERR(name);
if (IS_ERR(name))
- return ERR_PTR(err);
+ return ERR_CAST(name);
inst = kzalloc(sizeof(*inst) + sizeof(*spawn), GFP_KERNEL);
if (!inst)