diff options
author | Randy Dunlap <randy.dunlap@oracle.com> | 2011-05-09 13:47:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-10 14:19:54 -0400 |
commit | 7fb71adc357885c9ea9971efec3bb2a527b54364 (patch) | |
tree | f06e5bff2e1ccdcf2aa9c3197de5b4b7453d262f /drivers/staging/keucr | |
parent | d8aba9d5d6c0d9809798967b9aac293690233b6d (diff) |
staging/keucr: eliminate sparse warnings in ms.c
Eliminate sparse warnings in ms.c:
drivers/staging/keucr/ms.c:28:58: warning: right shift by bigger than source value
drivers/staging/keucr/ms.c:31:58: warning: right shift by bigger than source value
drivers/staging/keucr/ms.c:789:59: warning: cast truncates bits from constant value (ffffff7f becomes 7f)
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/keucr')
-rw-r--r-- | drivers/staging/keucr/common.h | 2 | ||||
-rw-r--r-- | drivers/staging/keucr/ms.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/drivers/staging/keucr/common.h b/drivers/staging/keucr/common.h index b87dc7a8901..cf347ccd6a6 100644 --- a/drivers/staging/keucr/common.h +++ b/drivers/staging/keucr/common.h | |||
@@ -9,5 +9,7 @@ typedef u16 *PWORD; | |||
9 | typedef u32 DWORD; | 9 | typedef u32 DWORD; |
10 | typedef u32 *PDWORD; | 10 | typedef u32 *PDWORD; |
11 | 11 | ||
12 | #define BYTE_MASK 0xff | ||
13 | |||
12 | #endif | 14 | #endif |
13 | 15 | ||
diff --git a/drivers/staging/keucr/ms.c b/drivers/staging/keucr/ms.c index a7137217cf8..52fe0a6eba2 100644 --- a/drivers/staging/keucr/ms.c +++ b/drivers/staging/keucr/ms.c | |||
@@ -25,10 +25,10 @@ int MS_ReaderCopyBlock(struct us_data *us, WORD oldphy, WORD newphy, WORD PhyBlo | |||
25 | bcb->CDB[1] = 0x08; | 25 | bcb->CDB[1] = 0x08; |
26 | bcb->CDB[4] = (BYTE)(oldphy); | 26 | bcb->CDB[4] = (BYTE)(oldphy); |
27 | bcb->CDB[3] = (BYTE)(oldphy>>8); | 27 | bcb->CDB[3] = (BYTE)(oldphy>>8); |
28 | bcb->CDB[2] = (BYTE)(oldphy>>16); | 28 | bcb->CDB[2] = 0; /* (BYTE)(oldphy>>16) */ |
29 | bcb->CDB[7] = (BYTE)(newphy); | 29 | bcb->CDB[7] = (BYTE)(newphy); |
30 | bcb->CDB[6] = (BYTE)(newphy>>8); | 30 | bcb->CDB[6] = (BYTE)(newphy>>8); |
31 | bcb->CDB[5] = (BYTE)(newphy>>16); | 31 | bcb->CDB[5] = 0; /* (BYTE)(newphy>>16) */ |
32 | bcb->CDB[9] = (BYTE)(PhyBlockAddr); | 32 | bcb->CDB[9] = (BYTE)(PhyBlockAddr); |
33 | bcb->CDB[8] = (BYTE)(PhyBlockAddr>>8); | 33 | bcb->CDB[8] = (BYTE)(PhyBlockAddr>>8); |
34 | bcb->CDB[10] = PageNum; | 34 | bcb->CDB[10] = PageNum; |
@@ -786,7 +786,8 @@ int MS_LibErrorPhyBlock(struct us_data *us, WORD phyblk) | |||
786 | MS_LibSetAcquiredErrorBlock(us, phyblk); | 786 | MS_LibSetAcquiredErrorBlock(us, phyblk); |
787 | 787 | ||
788 | if (MS_LibIsWritable(us)) | 788 | if (MS_LibIsWritable(us)) |
789 | return MS_LibOverwriteExtra(us, phyblk, 0, (BYTE)(~MS_REG_OVR_BKST)); | 789 | return MS_LibOverwriteExtra(us, phyblk, 0, |
790 | (BYTE)(~MS_REG_OVR_BKST & BYTE_MASK)); | ||
790 | 791 | ||
791 | 792 | ||
792 | return MS_STATUS_SUCCESS; | 793 | return MS_STATUS_SUCCESS; |