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

Commit 4753cbc0 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Christoph Hellwig
Browse files

scsi: use 'bool' as return value for scsi_normalize_sense() 



Convert scsi_normalize_sense() and friends to return 'bool'
instead of an integer.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Reviewed-by: default avatarRobert Elliott <elliott@hp.com>
Reviewed-by: default avatarYoshihiro Yunomae <yoshihiro.yunomae.ez@hitachi.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 15c75f8a

drivers/scsi/scsi_error.c

+8 −8
Original line number Diff line number Diff line
@@ -2422,20 +2422,20 @@ EXPORT_SYMBOL(scsi_reset_provider); 
 *	responded to a SCSI command with the CHECK_CONDITION status.

 *

 * Return value:

 *	1 if valid sense data information found, else 0;

 *	true if valid sense data information found, else false;

 */

int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,

bool scsi_normalize_sense(const u8 *sense_buffer, int sb_len,

			  struct scsi_sense_hdr *sshdr)

{

	if (!sense_buffer || !sb_len)

		return 0;

		return false;



	memset(sshdr, 0, sizeof(struct scsi_sense_hdr));



	sshdr->response_code = (sense_buffer[0] & 0x7f);



	if (!scsi_sense_valid(sshdr))

		return 0;

		return false;



	if (sshdr->response_code >= 0x72) {

		/*
@@ -2465,11 +2465,11 @@ int scsi_normalize_sense(const u8 *sense_buffer, int sb_len, 
		}

	}



	return 1;

	return true;

}

EXPORT_SYMBOL(scsi_normalize_sense);



int scsi_command_normalize_sense(struct scsi_cmnd *cmd,

bool scsi_command_normalize_sense(const struct scsi_cmnd *cmd,

				  struct scsi_sense_hdr *sshdr)

{

	return scsi_normalize_sense(cmd->sense_buffer,

drivers/scsi/scsi_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -831,7 +831,7 @@ void scsi_io_completion(struct scsi_cmnd *cmd, unsigned int good_bytes) 
	struct request *req = cmd->request;

	int error = 0;

	struct scsi_sense_hdr sshdr;

	int sense_valid = 0;

	bool sense_valid = false;

	int sense_deferred = 0;

	enum {ACTION_FAIL, ACTION_REPREP, ACTION_RETRY,

	      ACTION_DELAYED_RETRY} action;

include/scsi/scsi_eh.h

+7 −7
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ struct scsi_sense_hdr { /* See SPC-3 section 4.5 */ 
	u8 additional_length;	/* always 0 for fixed sense format */

};



static inline int scsi_sense_valid(struct scsi_sense_hdr *sshdr)

static inline bool scsi_sense_valid(const struct scsi_sense_hdr *sshdr)

{

	if (!sshdr)

		return 0;

		return false;



	return (sshdr->response_code & 0x70) == 0x70;

}
@@ -42,12 +42,12 @@ extern void scsi_eh_flush_done_q(struct list_head *done_q); 
extern void scsi_report_bus_reset(struct Scsi_Host *, int);

extern void scsi_report_device_reset(struct Scsi_Host *, int, int);

extern int scsi_block_when_processing_errors(struct scsi_device *);

extern int scsi_normalize_sense(const u8 *sense_buffer, int sb_len,

extern bool scsi_normalize_sense(const u8 *sense_buffer, int sb_len,

				 struct scsi_sense_hdr *sshdr);

extern int scsi_command_normalize_sense(struct scsi_cmnd *cmd,

extern bool scsi_command_normalize_sense(const struct scsi_cmnd *cmd,

					 struct scsi_sense_hdr *sshdr);



static inline int scsi_sense_is_deferred(const struct scsi_sense_hdr *sshdr)

static inline bool scsi_sense_is_deferred(const struct scsi_sense_hdr *sshdr)

{

	return ((sshdr->response_code >= 0x70) && (sshdr->response_code & 1));

}