aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/scsi
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2011-02-22 19:54:38 +0100
committerJames Bottomley <James.Bottomley@suse.de>2011-02-25 12:00:36 -0500
commit4e7d7af4dfea65b50b0fc694e3febc202e4e9839 (patch)
tree4331b7bd0d50e6bdbc798458f4ea804e2e2129f0 /drivers/s390/scsi
parent[SCSI] be2iscsi: fix null ptr ref in conn get param (diff)
downloadlinux-dev-4e7d7af4dfea65b50b0fc694e3febc202e4e9839.tar.xz
linux-dev-4e7d7af4dfea65b50b0fc694e3febc202e4e9839.zip
[SCSI] zfcp: Remove redundant unlikely()
IS_ERR() already implies unlikely(), so it can be omitted here. Signed-off-by: Tobias Klauser <tklauser@distanz.ch> Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com> Signed-off-by: Steffen Maier <maier@linux.vnet.ibm.com> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/s390/scsi')
-rw-r--r--drivers/s390/scsi/zfcp_fsf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c
index 60ff9d172c79..14a427457fa1 100644
--- a/drivers/s390/scsi/zfcp_fsf.c
+++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -1552,7 +1552,7 @@ int zfcp_fsf_open_wka_port(struct zfcp_fc_wka_port *wka_port)
SBAL_FLAGS0_TYPE_READ,
qdio->adapter->pool.erp_req);
- if (unlikely(IS_ERR(req))) {
+ if (IS_ERR(req)) {
retval = PTR_ERR(req);
goto out;
}
@@ -1605,7 +1605,7 @@ int zfcp_fsf_close_wka_port(struct zfcp_fc_wka_port *wka_port)
SBAL_FLAGS0_TYPE_READ,
qdio->adapter->pool.erp_req);
- if (unlikely(IS_ERR(req))) {
+ if (IS_ERR(req)) {
retval = PTR_ERR(req);
goto out;
}