projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e37390b
)
cxlflash: drop unlikely before IS_ERR_OR_NULL
author
Geliang Tang
<
[email protected]
>
Thu, 3 Dec 2015 21:18:49 +0000
(15:18 -0600)
committer
Martin K. Petersen
<
[email protected]
>
Thu, 10 Dec 2015 17:55:37 +0000
(12:55 -0500)
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: Martin K. Petersen <
[email protected]
>
drivers/scsi/cxlflash/superpipe.c
patch
|
blob
|
history
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;