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

Commit 55c9d371 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Martin K. Petersen
Browse files

scsi: bfa: remove ScsiResult macro 



Remove the ScsiResult macro and open code it on all call sites.

This will make subsequent refactoring in this area easier.

Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2d362b8a

drivers/scsi/bfa/bfad_im.c

+8 −11
Original line number Diff line number Diff line
@@ -70,21 +70,18 @@ bfa_cb_ioim_done(void *drv, struct bfad_ioim_s *dio, 
				host_status = DID_ERROR;

			}

		}

		cmnd->result = ScsiResult(host_status, scsi_status);

		cmnd->result = host_status << 16 | scsi_status;



		break;



	case BFI_IOIM_STS_TIMEDOUT:

		host_status = DID_TIME_OUT;

		cmnd->result = ScsiResult(host_status, 0);

		cmnd->result = DID_TIME_OUT << 16;

		break;

	case BFI_IOIM_STS_PATHTOV:

		host_status = DID_TRANSPORT_DISRUPTED;

		cmnd->result = ScsiResult(host_status, 0);

		cmnd->result = DID_TRANSPORT_DISRUPTED << 16;

		break;

	default:

		host_status = DID_ERROR;

		cmnd->result = ScsiResult(host_status, 0);

		cmnd->result = DID_ERROR << 16;

	}



	/* Unmap DMA, if host is NULL, it means a scsi passthru cmd */
@@ -117,7 +114,7 @@ bfa_cb_ioim_good_comp(void *drv, struct bfad_ioim_s *dio) 
	struct bfad_itnim_data_s *itnim_data;

	struct bfad_itnim_s *itnim;



	cmnd->result = ScsiResult(DID_OK, SCSI_STATUS_GOOD);

	cmnd->result = DID_OK << 16 | SCSI_STATUS_GOOD;



	/* Unmap DMA, if host is NULL, it means a scsi passthru cmd */

	if (cmnd->device->host != NULL)
@@ -144,7 +141,7 @@ bfa_cb_ioim_abort(void *drv, struct bfad_ioim_s *dio) 
	struct scsi_cmnd *cmnd = (struct scsi_cmnd *)dio;

	struct bfad_s         *bfad = drv;



	cmnd->result = ScsiResult(DID_ERROR, 0);

	cmnd->result = DID_ERROR << 16;



	/* Unmap DMA, if host is NULL, it means a scsi passthru cmd */

	if (cmnd->device->host != NULL)
@@ -1253,14 +1250,14 @@ bfad_im_queuecommand_lck(struct scsi_cmnd *cmnd, void (*done) (struct scsi_cmnd 
		printk(KERN_WARNING

			"bfad%d, queuecommand %p %x failed, BFA stopped\n",

		       bfad->inst_no, cmnd, cmnd->cmnd[0]);

		cmnd->result = ScsiResult(DID_NO_CONNECT, 0);

		cmnd->result = DID_NO_CONNECT << 16;

		goto out_fail_cmd;

	}





	itnim = itnim_data->itnim;

	if (!itnim) {

		cmnd->result = ScsiResult(DID_IMM_RETRY, 0);

		cmnd->result = DID_IMM_RETRY << 16;

		goto out_fail_cmd;

	}

drivers/scsi/bfa/bfad_im.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ u32 bfad_im_supported_speeds(struct bfa_s *bfa); 
#define MAX_FCP_LUN 16384

#define BFAD_TARGET_RESET_TMO 60

#define BFAD_LUN_RESET_TMO 60

#define ScsiResult(host_code, scsi_code) (((host_code) << 16) | scsi_code)

#define BFA_QUEUE_FULL_RAMP_UP_TIME 120



/*