From 3f549af37963bf5805652e31053401875bbee6f3 Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Thu, 23 Oct 2014 14:31:00 -0400 Subject: [PATCH] staging: unisys: fix CamelCase names in struct sense_data Fix CamelCase names: ErrorCode => error_code Valid => valid SegmentNumber => segment_number SenseKey => sense_key Reserved => reserved IncorrectLength => incorrect_length EndOfMedia => end_of_media FileMark => file_mark Information => information AdditionalSenseLength => additional_sense_length CommandSpecificInformation => commmand_specific_information AdditionalSenseCode => additional_sense_code AdditionalSenseCodeQualifier => additional_sense_code_qualifier FieldReplaceableUnitCode => fru_code SenseKeySpecific => sense_key_specific Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- .../common-spar/include/channels/iochannel.h | 30 +++++++++++----------- drivers/staging/unisys/virthba/virthba.c | 6 ++--- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/unisys/common-spar/include/channels/iochannel.h b/drivers/staging/unisys/common-spar/include/channels/iochannel.h index 3256ff5..1ebaa5b 100644 --- a/drivers/staging/unisys/common-spar/include/channels/iochannel.h +++ b/drivers/staging/unisys/common-spar/include/channels/iochannel.h @@ -410,21 +410,21 @@ struct uiscmdrsp_scsi { * AdditionalSenseLength contains will be sizeof(sense_data)-8=10. */ struct sense_data { - u8 ErrorCode:7; - u8 Valid:1; - u8 SegmentNumber; - u8 SenseKey:4; - u8 Reserved:1; - u8 IncorrectLength:1; - u8 EndOfMedia:1; - u8 FileMark:1; - u8 Information[4]; - u8 AdditionalSenseLength; - u8 CommandSpecificInformation[4]; - u8 AdditionalSenseCode; - u8 AdditionalSenseCodeQualifier; - u8 FieldReplaceableUnitCode; - u8 SenseKeySpecific[3]; + u8 errorcode:7; + u8 valid:1; + u8 segment_number; + u8 sense_key:4; + u8 reserved:1; + u8 incorrect_length:1; + u8 end_of_media:1; + u8 file_mark:1; + u8 information[4]; + u8 additional_sense_length; + u8 command_specific_information[4]; + u8 additional_sense_code; + u8 additional_sense_code_qualifier; + u8 fru_code; + u8 sense_key_specific[3]; }; /* some SCSI ADSENSE codes */ diff --git a/drivers/staging/unisys/virthba/virthba.c b/drivers/staging/unisys/virthba/virthba.c index 1e921f0..a3ea087 100644 --- a/drivers/staging/unisys/virthba/virthba.c +++ b/drivers/staging/unisys/virthba/virthba.c @@ -1143,9 +1143,9 @@ do_scsi_linuxstat(struct uiscmdrsp *cmdrsp, struct scsi_cmnd *scsicmd) scsicmd, cmdrsp->scsi.cmnd[0], scsidev->host->host_no, scsidev->id, scsidev->channel, scsidev->lun, - cmdrsp->scsi.linuxstat, sd->Valid, sd->SenseKey, - sd->AdditionalSenseCode, - sd->AdditionalSenseCodeQualifier); + cmdrsp->scsi.linuxstat, sd->valid, sd->sense_key, + sd->additional_sense_code, + sd->additional_sense_code_qualifier); if (atomic_read(&vdisk->error_count) == VIRTHBA_ERROR_COUNT) { LOGERR("Throtling SCSICMD errors disk <%d:%d:%d:%llu>\n", -- 2.7.4