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

Commit 3e8afe35 authored by Julia Lawall's avatar Julia Lawall Committed by Herbert Xu
Browse files

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: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 7b5c253c

crypto/aead.c

+2 −4
Original line number Diff line number Diff line
@@ -282,18 +282,16 @@ struct crypto_instance *aead_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_AEAD | 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)

crypto/algapi.c

+1 −3
Original line number Diff line number Diff line
@@ -749,12 +749,10 @@ struct crypto_alg *crypto_attr_alg2(struct rtattr *rta, 
				    u32 type, u32 mask)

{

	const char *name;

	int err;



	name = crypto_attr_alg_name(rta);

	err = PTR_ERR(name);

	if (IS_ERR(name))

		return ERR_PTR(err);

		return ERR_CAST(name);



	return crypto_find_alg(name, frontend, type, mask);

}

crypto/authenc.c

+1 −2
Original line number Diff line number Diff line
@@ -592,9 +592,8 @@ static struct crypto_instance *crypto_authenc_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);

crypto/authencesn.c

+1 −2
Original line number Diff line number Diff line
@@ -715,9 +715,8 @@ static struct crypto_instance *crypto_authenc_esn_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);

crypto/blkcipher.c

+2 −4
Original line number Diff line number Diff line
@@ -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)