cxlflash: drop unlikely before IS_ERR_OR_NULL

IS_ERR_OR_NULL already contain an unlikely compiler flag. Drop it.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Acked-by: Manoj Kumar <manoj@linux.vnet.ibm.com>
Acked-by: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c
index 34b21a0a926a04bc09e2025786d00c3736bbd612..f4020dbb55c32440d78b3de073347b8f87d14ab6 100644 (file)
--- a/drivers/scsi/cxlflash/superpipe.c
+++ b/drivers/scsi/cxlflash/superpipe.c
@@ -1372,7 +1372,7 @@ static int cxlflash_disk_attach(struct scsi_device *sdev,
        }
 
        ctx = cxl_dev_context_init(cfg->dev);
-       if (unlikely(IS_ERR_OR_NULL(ctx))) {
+       if (IS_ERR_OR_NULL(ctx)) {
                dev_err(dev, "%s: Could not initialize context %p\n",
                        __func__, ctx);
                rc = -ENODEV;
@@ -1500,7 +1500,7 @@ static int recover_context(struct cxlflash_cfg *cfg, struct ctx_info *ctxi)
        struct afu *afu = cfg->afu;
 
        ctx = cxl_dev_context_init(cfg->dev);
-       if (unlikely(IS_ERR_OR_NULL(ctx))) {
+       if (IS_ERR_OR_NULL(ctx)) {
                dev_err(dev, "%s: Could not initialize context %p\n",
                        __func__, ctx);
                rc = -ENODEV;