Commit 867659c6 authored by Chengguang Xu's avatar Chengguang Xu Committed by Herbert Xu
Browse files

crypto: caam - remove redundant likely/unlikely annotation 



unlikely has already included in IS_ERR(), so just
remove redundant likely/unlikely annotation.

Signed-off-by: default avatarChengguang Xu <cgxu519@gmx.com>
Reviewed-by: default avatarHoria Geantă <horia.geanta@nxp.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent e8e3c1ca

drivers/crypto/caam/caamalg_qi.c

+3 −3
Original line number Diff line number Diff line
@@ -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;
@@ -893,7 +893,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 */
@@ -1191,7 +1191,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);

drivers/crypto/caam/qi.c

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