crypto: caam/qi - Change a couple IS_ERR_OR_NULL() checks to IS_ERR()
Subsystems (3)
PATCH 1/1 crypto: caam/qi - Change a couple IS_ERR_OR_NULL() checks to IS_ERR()
create_caam_req_fq() doesn't return NULL pointers so there is no need to check. The NULL checks are problematic because it's hard to say how a NULL return should be handled, so removing the checks is a nice cleanup.
--- drivers/crypto/caam/qi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/crypto/caam/qi.c +2 -2
@@ -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 (IS_ERR_OR_NULL (new_fq)) { +if (IS_ERR (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 (IS_ERR_OR_NULL (drv_ctx->req_fq)) { +if (IS_ERR (drv_ctx->req_fq)) {dev_err (qidev,"create_caam_req_fq failed\n" );dma_unmap_single (qidev, hwdesc, size,DMA_BIDIRECTIONAL );kfree (drv_ctx);
Signature · 1 line
2.17.1
Quoted 5 lines · Dan Carpenter
create_caam_req_fq()doesn't return NULL pointers so there is no need to check. The NULL checks are problematic because it's hard to say how a NULL return should be handled, so removing the checks is a nice cleanup.Signed-off-by Dan Carpenter <[email protected]>
Thanks,
Horia
Herbert Xu
maintainerQuoted 8 lines · Dan Carpenter
create_caam_req_fq()doesn't return NULL pointers so there is no need to check. The NULL checks are problematic because it's hard to say how a NULL return should be handled, so removing the checks is a nice cleanup.Signed-off-by Dan Carpenter <[email protected]>--- drivers/crypto/caam/qi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt