Commit
8db050786aaf7a43f4c7a900a103f99ea0fb493f
Exists in
master
and in
39 other branches
8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y
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: Julia Lawall <julia@diku.dk>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Showing
3 changed files
with
3 additions
and
3 deletions
Side-by-side Diff
| ... |
... |
@@ -616,7 +616,7 @@ |
|
616
|
616 |
auth = ahash_attr_alg(tb[1], CRYPTO_ALG_TYPE_HASH, |
|
617
|
617 |
CRYPTO_ALG_TYPE_AHASH_MASK); |
|
618
|
618 |
if (IS_ERR(auth)) |
|
619
|
|
- return ERR_PTR(PTR_ERR(auth)); |
|
|
619 |
+ return ERR_CAST(auth); |
|
620
|
620 |
|
|
621
|
621 |
auth_base = &auth->base; |
|
622
|
622 |
|
| ... |
... |
@@ -185,7 +185,7 @@ |
|
185
|
185 |
alg = crypto_attr_alg(tb[1], CRYPTO_ALG_TYPE_CIPHER, |
|
186
|
186 |
CRYPTO_ALG_TYPE_MASK); |
|
187
|
187 |
if (IS_ERR(alg)) |
|
188
|
|
- return ERR_PTR(PTR_ERR(alg)); |
|
|
188 |
+ return ERR_CAST(alg); |
|
189
|
189 |
|
|
190
|
190 |
/* Block size must be >= 4 bytes. */ |
|
191
|
191 |
err = -EINVAL; |
| ... |
... |
@@ -224,7 +224,7 @@ |
|
224
|
224 |
alg = crypto_get_attr_alg(tb, CRYPTO_ALG_TYPE_CIPHER, |
|
225
|
225 |
CRYPTO_ALG_TYPE_MASK); |
|
226
|
226 |
if (IS_ERR(alg)) |
|
227
|
|
- return ERR_PTR(PTR_ERR(alg)); |
|
|
227 |
+ return ERR_CAST(alg); |
|
228
|
228 |
|
|
229
|
229 |
inst = crypto_alloc_instance("xts", alg); |
|
230
|
230 |
if (IS_ERR(inst)) |
Herbert Xu