Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8db05078 authored by Julia Lawall's avatar Julia Lawall Committed by Herbert Xu
Browse files

crypto: Use ERR_CAST 

Use ERR_CAST(x) rather than ERR_PTR(PTR_ERR(x)).  The former makes more
clear what is the purpose of the operation, which otherwise looks like a
no-op.

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

)

// <smpl>
@@
type T;
T x;
identifier f;
@@

T f (...) { <+...
- ERR_PTR(PTR_ERR(x))
+ x
 ...+> }

@@
expression x;
@@

- ERR_PTR(PTR_ERR(x))
+ ERR_CAST(x)
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 1efbd15c

crypto/authenc.c

+1 −1
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ static struct crypto_instance *crypto_authenc_alloc(struct rtattr **tb) 
	auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH,

			       CRYPTO_ALG_TYPE_AHASH_MASK);

	if (IS_ERR(auth))

		return ERR_PTR(PTR_ERR(auth));

		return ERR_CAST(auth);



	auth_base = &auth->base;

crypto/ctr.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ static struct crypto_instance *crypto_ctr_alloc(struct rtattr **tb) 
	alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_CIPHER,

				  CRYPTO_ALG_TYPE_MASK);

	if (IS_ERR(alg))

		return ERR_PTR(PTR_ERR(alg));

		return ERR_CAST(alg);



	/* Block size must be >= 4 bytes. */

	err = -EINVAL;

crypto/xts.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ static struct crypto_instance *alloc(struct rtattr **tb) 
	alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER,

				  CRYPTO_ALG_TYPE_MASK);

	if (IS_ERR(alg))

		return ERR_PTR(PTR_ERR(alg));

		return ERR_CAST(alg);



	inst = crypto_alloc_instance("xts", alg);

	if (IS_ERR(inst))