* [PATCH v2] crypto: caam - remove redundant likely/unlikely annotation
@ 2019-02-20 10:49 Chengguang Xu
2019-02-22 11:02 ` Horia Geanta
2019-02-28 6:30 ` Herbert Xu
0 siblings, 2 replies; 3+ messages in thread
From: Chengguang Xu @ 2019-02-20 10:49 UTC (permalink / raw)
To: horia.geanta, aymen.sghaier, herbert, davem; +Cc: linux-crypto, Chengguang Xu
unlikely has already included in IS_ERR(), so just
remove redundant likely/unlikely annotation.
Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
---
v1->v2:
- Fix subject typo and format.
drivers/crypto/caam/caamalg_qi.c | 6 +++---
drivers/crypto/caam/qi.c | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index c0d55310aade..7d5f47203074 100644
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -782,7 +782,7 @@ static struct caam_drv_ctx *get_drv_ctx(struct caam_ctx *ctx,
cpu = smp_processor_id();
drv_ctx = caam_drv_ctx_init(ctx->qidev, &cpu, desc);
- if (likely(!IS_ERR_OR_NULL(drv_ctx)))
+ if (!IS_ERR_OR_NULL(drv_ctx))
drv_ctx->op_type = type;
ctx->drv_ctx[type] = drv_ctx;
@@ -892,7 +892,7 @@ static struct aead_edesc *aead_edesc_alloc(struct aead_request *req,
struct caam_drv_ctx *drv_ctx;
drv_ctx = get_drv_ctx(ctx, encrypt ? ENCRYPT : DECRYPT);
- if (unlikely(IS_ERR_OR_NULL(drv_ctx)))
+ if (IS_ERR_OR_NULL(drv_ctx))
return (struct aead_edesc *)drv_ctx;
/* allocate space for base edesc and hw desc commands, link tables */
@@ -1184,7 +1184,7 @@ static struct skcipher_edesc *skcipher_edesc_alloc(struct skcipher_request *req,
struct caam_drv_ctx *drv_ctx;
drv_ctx = get_drv_ctx(ctx, encrypt ? ENCRYPT : DECRYPT);
- if (unlikely(IS_ERR_OR_NULL(drv_ctx)))
+ if (IS_ERR_OR_NULL(drv_ctx))
return (struct skcipher_edesc *)drv_ctx;
src_nents = sg_nents_for_len(req->src, req->cryptlen);
diff --git a/drivers/crypto/caam/qi.c b/drivers/crypto/caam/qi.c
index b84e6c8b1e13..7cb8b1755e57 100644
--- a/drivers/crypto/caam/qi.c
+++ b/drivers/crypto/caam/qi.c
@@ -318,7 +318,7 @@ int caam_drv_ctx_update(struct caam_drv_ctx *drv_ctx, u32 *sh_desc)
/* Create a new req FQ in parked state */
new_fq = create_caam_req_fq(drv_ctx->qidev, drv_ctx->rsp_fq,
drv_ctx->context_a, 0);
- if (unlikely(IS_ERR_OR_NULL(new_fq))) {
+ if (IS_ERR_OR_NULL(new_fq)) {
dev_err(qidev, "FQ allocation for shdesc update failed\n");
return PTR_ERR(new_fq);
}
@@ -431,7 +431,7 @@ struct caam_drv_ctx *caam_drv_ctx_init(struct device *qidev,
/* Attach request FQ */
drv_ctx->req_fq = create_caam_req_fq(qidev, drv_ctx->rsp_fq, hwdesc,
QMAN_INITFQ_FLAG_SCHED);
- if (unlikely(IS_ERR_OR_NULL(drv_ctx->req_fq))) {
+ if (IS_ERR_OR_NULL(drv_ctx->req_fq)) {
dev_err(qidev, "create_caam_req_fq failed\n");
dma_unmap_single(qidev, hwdesc, size, DMA_BIDIRECTIONAL);
kfree(drv_ctx);
--
2.20.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v2] crypto: caam - remove redundant likely/unlikely annotation
2019-02-20 10:49 [PATCH v2] crypto: caam - remove redundant likely/unlikely annotation Chengguang Xu
@ 2019-02-22 11:02 ` Horia Geanta
2019-02-28 6:30 ` Herbert Xu
1 sibling, 0 replies; 3+ messages in thread
From: Horia Geanta @ 2019-02-22 11:02 UTC (permalink / raw)
To: Chengguang Xu, Aymen Sghaier, herbert, davem; +Cc: linux-crypto
On 2/20/2019 12:50 PM, Chengguang Xu wrote:
> unlikely has already included in IS_ERR(), so just
> remove redundant likely/unlikely annotation.
>
> Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Reviewed-by: Horia Geantă <horia.geanta@nxp.com>
Thanks,
Horia
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v2] crypto: caam - remove redundant likely/unlikely annotation
2019-02-20 10:49 [PATCH v2] crypto: caam - remove redundant likely/unlikely annotation Chengguang Xu
2019-02-22 11:02 ` Horia Geanta
@ 2019-02-28 6:30 ` Herbert Xu
1 sibling, 0 replies; 3+ messages in thread
From: Herbert Xu @ 2019-02-28 6:30 UTC (permalink / raw)
To: Chengguang Xu; +Cc: horia.geanta, aymen.sghaier, davem, linux-crypto
On Wed, Feb 20, 2019 at 06:49:18PM +0800, Chengguang Xu wrote:
> unlikely has already included in IS_ERR(), so just
> remove redundant likely/unlikely annotation.
>
> Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
> ---
> v1->v2:
> - Fix subject typo and format.
>
> drivers/crypto/caam/caamalg_qi.c | 6 +++---
> drivers/crypto/caam/qi.c | 4 ++--
> 2 files changed, 5 insertions(+), 5 deletions(-)
Patch applied. Thanks.
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-02-28 6:30 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-20 10:49 [PATCH v2] crypto: caam - remove redundant likely/unlikely annotation Chengguang Xu
2019-02-22 11:02 ` Horia Geanta
2019-02-28 6:30 ` Herbert Xu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.