2015-12-03 21:19:28

by Matthew R. Ochs

Subject: [PATCH RESEND] cxlflash: drop unlikely before IS_ERR_OR_NULL

From: Geliang Tang <[email protected]>

IS_ERR_OR_NULL already contain an unlikely compiler flag. Drop it.

Signed-off-by: Geliang Tang <[email protected]>
Acked-by: Manoj Kumar <[email protected]>
Acked-by: Matthew R. Ochs <[email protected]>
Signed-off-by: Matthew R. Ochs <[email protected]>
---
This patch was originally sent by Geliang Tang in October 2015. As a
valid simplification, I'd like to see this make it into 'next'. I've
gone ahead and performed the rebase so that it applies cleanly.

drivers/scsi/cxlflash/superpipe.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/cxlflash/superpipe.c b/drivers/scsi/cxlflash/superpipe.c
index 34b21a0..f4020db 100644
--- 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;
--
2.1.0

2015-12-10 17:56:24

by Martin K. Petersen

Subject: Re: [PATCH RESEND] cxlflash: drop unlikely before IS_ERR_OR_NULL

>>>>> "Matthew" == Matthew R Ochs <[email protected]> writes:

Matthew> IS_ERR_OR_NULL already contain an unlikely compiler flag. Drop
Matthew> it.

Applied to 4.5/scsi-queue.

--
Martin K. Petersen Oracle Linux Engineering