Commit 92821ff1 authored by Harvey Harrison's avatar Harvey Harrison Committed by James Toy

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_no
drivers/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_length
drivers/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_no
drivers/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_length
drivers/scsi/gdth.c:2407:33:    got restricted __be32 [usertype] <noident>
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Cc: Boaz Harrosh <bharrosh@panasas.com>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent d9d28518
...@@ -2391,7 +2391,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp) ...@@ -2391,7 +2391,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp)
case READ_CAPACITY: case READ_CAPACITY:
TRACE2(("Read capacity hdrive %d\n",t)); TRACE2(("Read capacity hdrive %d\n",t));
if (ha->hdr[t].size > (ulong64)0xffffffff) if (ha->hdr[t].size > (ulong64)0xffffffff)
rdc.last_block_no = 0xffffffff; rdc.last_block_no = cpu_to_be32(0xffffffff);
else else
rdc.last_block_no = cpu_to_be32(ha->hdr[t].size-1); rdc.last_block_no = cpu_to_be32(ha->hdr[t].size-1);
rdc.block_length = cpu_to_be32(SECTOR_SIZE); rdc.block_length = cpu_to_be32(SECTOR_SIZE);
......
...@@ -968,14 +968,14 @@ typedef struct { ...@@ -968,14 +968,14 @@ typedef struct {
/* READ_CAPACITY data format */ /* READ_CAPACITY data format */
typedef struct { typedef struct {
ulong32 last_block_no; __be32 last_block_no;
ulong32 block_length; __be32 block_length;
} PACKED gdth_rdcap_data; } PACKED gdth_rdcap_data;
/* READ_CAPACITY (16) data format */ /* READ_CAPACITY (16) data format */
typedef struct { typedef struct {
ulong64 last_block_no; __be64 last_block_no;
ulong32 block_length; __be32 block_length;
} PACKED gdth_rdcap16_data; } PACKED gdth_rdcap16_data;
/* REQUEST_SENSE data format */ /* REQUEST_SENSE data format */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment