mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
cciss: use upper_32_bits() macro to eliminate warnings
Use upper_32_bits(x) macro to handle shifts that may be >= the width of the data type. drivers/block/cciss.c: In function 'do_cciss_request': drivers/block/cciss.c:2655: warning: right shift count >= width of type drivers/block/cciss.c:2656: warning: right shift count >= width of type drivers/block/cciss.c:2657: warning: right shift count >= width of type drivers/block/cciss.c:2658: warning: right shift count >= width of type Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Cc: <mike.miller@hp.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
5e2cb1018a
commit
582539e5a0
1 changed files with 6 additions and 4 deletions
|
@ -2630,12 +2630,14 @@ static void do_cciss_request(struct request_queue *q)
|
|||
c->Request.CDB[8] = creq->nr_sectors & 0xff;
|
||||
c->Request.CDB[9] = c->Request.CDB[11] = c->Request.CDB[12] = 0;
|
||||
} else {
|
||||
u32 upper32 = upper_32_bits(start_blk);
|
||||
|
||||
c->Request.CDBLen = 16;
|
||||
c->Request.CDB[1]= 0;
|
||||
c->Request.CDB[2]= (start_blk >> 56) & 0xff; //MSB
|
||||
c->Request.CDB[3]= (start_blk >> 48) & 0xff;
|
||||
c->Request.CDB[4]= (start_blk >> 40) & 0xff;
|
||||
c->Request.CDB[5]= (start_blk >> 32) & 0xff;
|
||||
c->Request.CDB[2]= (upper32 >> 24) & 0xff; //MSB
|
||||
c->Request.CDB[3]= (upper32 >> 16) & 0xff;
|
||||
c->Request.CDB[4]= (upper32 >> 8) & 0xff;
|
||||
c->Request.CDB[5]= upper32 & 0xff;
|
||||
c->Request.CDB[6]= (start_blk >> 24) & 0xff;
|
||||
c->Request.CDB[7]= (start_blk >> 16) & 0xff;
|
||||
c->Request.CDB[8]= (start_blk >> 8) & 0xff;
|
||||
|
|
Loading…
Reference in a new issue