On 09/05/2014 02:51 AM, Yoshihiro YUNOMAE wrote: > (2014/09/03 19:06), Hannes Reinecke wrote: >> Convert scsi_normalize_sense() and frieds to return 'bool' >> instead of an integer. >> >> Signed-off-by: Hannes Reinecke <[email protected]> >> --- >> drivers/scsi/scsi_error.c | 14 +++++++------- >> drivers/scsi/scsi_lib.c | 2 +- >> include/scsi/scsi_eh.h | 12 ++++++------ >> 3 files changed, 14 insertions(+), 14 deletions(-) >> >> diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c >> index 6c99624..8a6d382 100644 >> --- a/drivers/scsi/scsi_error.c >> +++ b/drivers/scsi/scsi_error.c >> @@ -2408,20 +2408,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, >> - struct scsi_sense_hdr *sshdr) >> +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) { >> /* >> @@ -2451,11 +2451,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(struct scsi_cmnd *cmd, >> struct scsi_sense_hdr *sshdr) >> { >> return scsi_normalize_sense(cmd->sense_buffer, >> diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c >> index de178f7..8cad004 100644 >> --- a/drivers/scsi/scsi_lib.c >> +++ b/drivers/scsi/scsi_lib.c >> @@ -830,7 +830,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; >> diff --git a/include/scsi/scsi_eh.h b/include/scsi/scsi_eh.h >> index 06a8790..1427a66 100644 >> --- a/include/scsi/scsi_eh.h >> +++ b/include/scsi/scsi_eh.h >> @@ -27,7 +27,7 @@ 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(struct scsi_sense_hdr *sshdr) >> { >> if (!sshdr) >> return 0; > > Should be "return false;" > Bah. You are correct.
Cheers, Hannes -- Dr. Hannes Reinecke zSeries & Storage [email protected] +49 911 74053 688 SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg) -- To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
