megaraid: fix fw/bios version output (sparse shift warnings)
Subsystems (2)
PATCH 1/1 megaraid: fix fw/bios version output (sparse shift warnings)
From: Randy Dunlap <[email protected]>
Fix fw_version and bios_version output strings.
Fix sparse warnings of right shift bigger than source value size:
drivers/scsi/megaraid.c:311:65: warning: right shift by bigger than source value drivers/scsi/megaraid.c:313:65: warning: right shift by bigger than source value drivers/scsi/megaraid.c:317:67: warning: right shift by bigger than source value drivers/scsi/megaraid.c:319:67: warning: right shift by bigger than source value
Patch suggestion from email by Al Viro:
"Since both are claimed to be strings, I really suspect that this >> 8 is misspelled >> 4 and they have a character followed by pair of two-digit packed decimals in there..."
--- drivers/scsi/megaraid.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/scsi/megaraid.c +4 -4
@@ -308,15 +308,15 @@ mega_query_adapter(adapter_t *adapter)if (adapter->product_info.subsysvid ==HP_SUBSYS_VID ) {sprintf (adapter->fw_version,"%c%d%d.%d%d" , adapter->product_info.fw_version[2 ], - adapter->product_info.fw_version[1 ] >>8 , + adapter->product_info.fw_version[1 ] >>4 , adapter->product_info.fw_version[1 ] &0x0f , - adapter->product_info.fw_version[0 ] >>8 , + adapter->product_info.fw_version[0 ] >>4 , adapter->product_info.fw_version[0 ] &0x0f );sprintf (adapter->bios_version,"%c%d%d.%d%d" , adapter->product_info.bios_version[2 ], - adapter->product_info.bios_version[1 ] >>8 , + adapter->product_info.bios_version[1 ] >>4 , adapter->product_info.bios_version[1 ] &0x0f , - adapter->product_info.bios_version[0 ] >>8 , + adapter->product_info.bios_version[0 ] >>4 , adapter->product_info.bios_version[0 ] &0x0f ); }else { memcpy(adapter->fw_version,
On Mon, 7 Jun 2010 17:08:55 -0700 Randy Dunlap wrote:
ping??
Quoted 36 lines
From: Randy Dunlap <[email protected]>
Fix
fw_versionandbios_versionoutput strings.
Fix sparse warnings of right shift bigger than source value size:
drivers/scsi/megaraid.c:311:65: warning: right shift by bigger than source valuedrivers/scsi/megaraid.c:313:65: warning: right shift by bigger than source valuedrivers/scsi/megaraid.c:317:67: warning: right shift by bigger than source valuedrivers/scsi/megaraid.c:319:67: warning: right shift by bigger than source valuePatch suggestion from email by Al Viro:
"Since both are claimed to be strings, I really suspect that this >> 8 is misspelled >> 4 and they have a character followed by pair of two-digit packed decimals in there..."
Signed-off-by Randy Dunlap <[email protected]>Cc Al Viro <[email protected]>Cc Neela Syam Kolli <[email protected]>--- drivers/scsi/megaraid.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)drivers/scsi/megaraid.c +2
-2@@ -308,15 +308,15 @@ mega_query_adapter(adapter_t *adapter)if (adapter->product_info.subsysvid ==HP_SUBSYS_VID ) {sprintf (adapter->fw_version,"%c%d%d.%d%d" , adapter->product_info.fw_version[2 ], - adapter->product_info.fw_version[1 ] >>8 , + adapter->product_info.fw_version[1 ] >>4 , adapter->product_info.fw_version[1 ] &0x0f , - adapter->product_info.fw_version[0 ] >>8 , + adapter->product_info.fw_version[0 ] >>4 , adapter->product_info.fw_version[0 ] &0x0f ); sprintf (adapter->bios_version, "%c%d%d.%d%d",
drivers/scsi/megaraid.c mega_query_adapter(adapter_t *adapter)
Quoted 10 lines
drivers/scsi/megaraid.c +2
-3adapter->product_info.bios_version[2 ], - adapter->product_info.bios_version[1 ] >>8 , + adapter->product_info.bios_version[1 ] >>4 , adapter->product_info.bios_version[1 ] &0x0f , - adapter->product_info.bios_version[0 ] >>8 , + adapter->product_info.bios_version[0 ] >>4 , adapter->product_info.bios_version[0] & 0x0f); }else { memcpy(adapter->fw_version, --
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***