Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 025270f0 authored by Hirofumi Nakagawa's avatar Hirofumi Nakagawa Committed by James Bottomley
Browse files

[SCSI] zfcp: Remove duplicated unlikely() macros. 



Some drivers have duplicated unlikely() macros. IS_ERR() already
has unlikely() in itself. This patch cleans up such pointless
codes although there is no real effect on the kernel's behaviour.

Signed-off-by: default avatarHirofumi Nakagawa <hnakagawa@miraclelinux.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 6139308d

drivers/s390/scsi/zfcp_fsf.c

+16 −16
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ int zfcp_fsf_status_read(struct zfcp_adapter *adapter) 
	req = zfcp_fsf_req_create(adapter, FSF_QTCB_UNSOLICITED_STATUS,

				  ZFCP_REQ_NO_QTCB,

				  adapter->pool.fsf_req_status_read);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -988,7 +988,7 @@ struct zfcp_fsf_req *zfcp_fsf_abort_fcp_command(unsigned long old_req_id, 
		goto out;

	req = zfcp_fsf_req_create(adapter, FSF_QTCB_ABORT_FCP_CMND,

				  req_flags, adapter->pool.fsf_req_abort);

	if (unlikely(IS_ERR(req)))

	if (IS_ERR(req))

		goto out;



	if (unlikely(!(atomic_read(&unit->status) &
@@ -1112,7 +1112,7 @@ int zfcp_fsf_send_ct(struct zfcp_send_ct *ct, mempool_t *pool, 


	req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_GENERIC,

				  ZFCP_REQ_AUTO_CLEANUP, pool);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		ret = PTR_ERR(req);

		goto out;

	}
@@ -1223,7 +1223,7 @@ int zfcp_fsf_send_els(struct zfcp_send_els *els) 
		goto out;

	req = zfcp_fsf_req_create(adapter, FSF_QTCB_SEND_ELS,

				  ZFCP_REQ_AUTO_CLEANUP, NULL);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		ret = PTR_ERR(req);

		goto out;

	}
@@ -1270,7 +1270,7 @@ int zfcp_fsf_exchange_config_data(struct zfcp_erp_action *erp_action) 
				  FSF_QTCB_EXCHANGE_CONFIG_DATA,

				  ZFCP_REQ_AUTO_CLEANUP,

				  adapter->pool.fsf_req_erp);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -1312,7 +1312,7 @@ int zfcp_fsf_exchange_config_data_sync(struct zfcp_adapter *adapter, 


	req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_CONFIG_DATA,

				  0, NULL);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -1365,7 +1365,7 @@ int zfcp_fsf_exchange_port_data(struct zfcp_erp_action *erp_action) 
	req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA,

				  ZFCP_REQ_AUTO_CLEANUP,

				  adapter->pool.fsf_req_erp);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -1411,7 +1411,7 @@ int zfcp_fsf_exchange_port_data_sync(struct zfcp_adapter *adapter, 


	req = zfcp_fsf_req_create(adapter, FSF_QTCB_EXCHANGE_PORT_DATA, 0,

				  NULL);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -1539,7 +1539,7 @@ int zfcp_fsf_open_port(struct zfcp_erp_action *erp_action) 
				  FSF_QTCB_OPEN_PORT_WITH_DID,

				  ZFCP_REQ_AUTO_CLEANUP,

				  adapter->pool.fsf_req_erp);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -1610,7 +1610,7 @@ int zfcp_fsf_close_port(struct zfcp_erp_action *erp_action) 
	req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PORT,

				  ZFCP_REQ_AUTO_CLEANUP,

				  adapter->pool.fsf_req_erp);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -1707,7 +1707,7 @@ int zfcp_fsf_close_physical_port(struct zfcp_erp_action *erp_action) 
	req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_PHYSICAL_PORT,

				  ZFCP_REQ_AUTO_CLEANUP,

				  adapter->pool.fsf_req_erp);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -1882,7 +1882,7 @@ int zfcp_fsf_open_unit(struct zfcp_erp_action *erp_action) 
	req = zfcp_fsf_req_create(adapter, FSF_QTCB_OPEN_LUN,

				  ZFCP_REQ_AUTO_CLEANUP,

				  adapter->pool.fsf_req_erp);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -1971,7 +1971,7 @@ int zfcp_fsf_close_unit(struct zfcp_erp_action *erp_action) 
	req = zfcp_fsf_req_create(adapter, FSF_QTCB_CLOSE_LUN,

				  ZFCP_REQ_AUTO_CLEANUP,

				  adapter->pool.fsf_req_erp);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -2228,7 +2228,7 @@ int zfcp_fsf_send_fcp_command_task(struct zfcp_adapter *adapter, 
		goto out;

	req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,

				  adapter->pool.fsf_req_scsi);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = PTR_ERR(req);

		goto out;

	}
@@ -2351,7 +2351,7 @@ struct zfcp_fsf_req *zfcp_fsf_send_fcp_ctm(struct zfcp_adapter *adapter, 
		goto out;

	req = zfcp_fsf_req_create(adapter, FSF_QTCB_FCP_CMND, req_flags,

				  adapter->pool.fsf_req_scsi);

	if (unlikely(IS_ERR(req)))

	if (IS_ERR(req))

		goto out;



	req->status |= ZFCP_STATUS_FSFREQ_TASK_MANAGEMENT;
@@ -2422,7 +2422,7 @@ struct zfcp_fsf_req *zfcp_fsf_control_file(struct zfcp_adapter *adapter, 
		goto out;



	req = zfcp_fsf_req_create(adapter, fsf_cfdc->command, 0, NULL);

	if (unlikely(IS_ERR(req))) {

	if (IS_ERR(req)) {

		retval = -EPERM;

		goto out;

	}