scsi: annotate gdth_rdcap_data, gdth_rdcap16_data endianness
PATCH 8/10 scsi: annotate gdth_rdcap_data, gdth_rdcap16_data endianness
From: Harvey Harrison <[email protected]>
It would be easy to get rid of the typedefs too, but I kept this minimal.
Noticed by sparse:drivers/scsi/gdth.c:2395:31: warning: incorrect type in assignment (different base types)drivers/scsi/gdth.c:2395:31: expected unsigned int [unsigned] [assigned] [usertype] last_block_nodrivers/scsi/gdth.c:2395:31: got restricted __be32 [usertype] <noident>drivers/scsi/gdth.c:2396:27: warning: incorrect type in assignment (different base types)drivers/scsi/gdth.c:2396:27: expected unsigned int [unsigned] [assigned] [usertype] block_lengthdrivers/scsi/gdth.c:2396:27: got restricted __be32 [usertype] <noident>drivers/scsi/gdth.c:2406:33: warning: incorrect type in assignment (different base types)drivers/scsi/gdth.c:2406:33: expected unsigned long long [unsigned] [usertype] last_block_nodrivers/scsi/gdth.c:2406:33: got restricted __be64 [usertype] <noident>drivers/scsi/gdth.c:2407:33: warning: incorrect type in assignment (different base types)drivers/scsi/gdth.c:2407:33: expected unsigned int [unsigned] [usertype] block_lengthdrivers/scsi/gdth.c:2407:33: got restricted __be32 [usertype] <noident>
---
drivers/scsi/gdth.c | 2 +- drivers/scsi/gdth.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/gdth.c renamed from drivers/scsi/gdth.c~scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness +1 -1
@@ -2391,7 +2391,7 @@ static int gdth_internal_cache_cmd(gdth_case READ_CAPACITY :TRACE2 (("Read capacity hdrive %d\n" ,t));if (ha->hdr[t].size > (ulong64 )0xffffffff ) - rdc.last_block_no =0xffffffff ; + rdc.last_block_no =cpu_to_be32 (0xffffffff );else rdc.last_block_no =cpu_to_be32 (ha->hdr[t].size-1 ); rdc.block_length =cpu_to_be32 (SECTOR_SIZE );
drivers/scsi/gdth.h renamed from drivers/scsi/gdth.h~scsi-annotate-gdth_rdcap_data-gdth_rdcap16_data-endianness +4 -4
@@ -968,14 +968,14 @@ typedef struct {/* READ_CAPACITY data format */ typedef struct { -ulong32 last_block_no; -ulong32 block_length; +__be32 last_block_no; +__be32 block_length; } PACKED gdth_rdcap_data;/* READ_CAPACITY (16) data format */ typedef struct { -ulong64 last_block_no; -ulong32 block_length; +__be64 last_block_no; +__be32 block_length; } PACKED gdth_rdcap16_data;/* REQUEST_SENSE data format */
_