* [PATCH RESEND] cxlflash: drop unlikely before IS_ERR_OR_NULL
@ 2015-12-03 21:18 Matthew R. Ochs
2015-12-10 17:56 ` Martin K. Petersen
0 siblings, 1 reply; 2+ messages in thread
From: Matthew R. Ochs @ 2015-12-03 21:18 UTC (permalink / raw)
To: James Bottomley
Cc: Geliang Tang, Manoj N. Kumar, Wen Xiong, Michael Neuling,
Uma Krishnan, linux-scsi, linux-kernel
From: Geliang Tang <geliangtang@163.com>
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: Matthew R. Ochs <mrochs@linux.vnet.ibm.com>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH RESEND] cxlflash: drop unlikely before IS_ERR_OR_NULL
2015-12-03 21:18 [PATCH RESEND] cxlflash: drop unlikely before IS_ERR_OR_NULL Matthew R. Ochs
@ 2015-12-10 17:56 ` Martin K. Petersen
0 siblings, 0 replies; 2+ messages in thread
From: Martin K. Petersen @ 2015-12-10 17:56 UTC (permalink / raw)
To: Matthew R. Ochs
Cc: James Bottomley, Geliang Tang, Manoj N. Kumar, Wen Xiong,
Michael Neuling, Uma Krishnan, linux-scsi, linux-kernel
>>>>> "Matthew" == Matthew R Ochs <mrochs@linux.vnet.ibm.com> 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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-12-10 17:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-03 21:18 [PATCH RESEND] cxlflash: drop unlikely before IS_ERR_OR_NULL Matthew R. Ochs
2015-12-10 17:56 ` Martin K. Petersen
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.