Commit eb74b932 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: bfa: Drop driver-defined SCSI status codes 

Drop the driver-defined SCSI status codes and use the generic ones instead.

Link: https://lore.kernel.org/r/20210113090500.129644-10-hare@suse.de


Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 54c9f6fd

drivers/scsi/bfa/bfa_fc.h

+0 −15
Original line number Diff line number Diff line
@@ -33,21 +33,6 @@ struct scsi_cdb_s { 
	u8         scsi_cdb[SCSI_MAX_CDBLEN];

};



/* ------------------------------------------------------------

 * SCSI status byte values

 * ------------------------------------------------------------

 */

#define SCSI_STATUS_GOOD                   0x00

#define SCSI_STATUS_CHECK_CONDITION        0x02

#define SCSI_STATUS_CONDITION_MET          0x04

#define SCSI_STATUS_BUSY                   0x08

#define SCSI_STATUS_INTERMEDIATE           0x10

#define SCSI_STATUS_ICM                    0x14 /* intermediate condition met */

#define SCSI_STATUS_RESERVATION_CONFLICT   0x18

#define SCSI_STATUS_COMMAND_TERMINATED     0x22

#define SCSI_STATUS_QUEUE_FULL             0x28

#define SCSI_STATUS_ACA_ACTIVE             0x30



#define SCSI_MAX_ALLOC_LEN      0xFF    /* maximum allocarion length */



/*

drivers/scsi/bfa/bfa_fcpim.c

+1 −1
Original line number Diff line number Diff line
@@ -2146,7 +2146,7 @@ __bfa_cb_ioim_comp(void *cbarg, bfa_boolean_t complete) 
		/*

		 * setup sense information, if present

		 */

		if ((m->scsi_status == SCSI_STATUS_CHECK_CONDITION) &&

		if ((m->scsi_status == SAM_STAT_CHECK_CONDITION) &&

					m->sns_len) {

			sns_len = m->sns_len;

			snsinfo = BFA_SNSINFO_FROM_TAG(ioim->fcpim->fcp,

drivers/scsi/bfa/bfad_im.c

+1 −1
Original line number Diff line number Diff line
@@ -106,7 +106,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 = DID_OK << 16 | SCSI_STATUS_GOOD;

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



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

	if (cmnd->device->host != NULL)