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>

diff --git a/drivers/staging/keucr/common.h b/drivers/staging/keucr/common.h
index b87dc7a..cf347cc 100644 (file)
--- a/drivers/staging/keucr/common.h
+++ b/drivers/staging/keucr/common.h
@@ -9,5 +9,7 @@ typedef u16 *PWORD;
 typedef u32 DWORD;
 typedef u32 *PDWORD;
 
+#define BYTE_MASK      0xff
+
 #endif
 

diff --git a/drivers/staging/keucr/ms.c b/drivers/staging/keucr/ms.c
index a713721..52fe0a6 100644 (file)
--- 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
        bcb->CDB[1]                     = 0x08;
        bcb->CDB[4]                     = (BYTE)(oldphy);
        bcb->CDB[3]                     = (BYTE)(oldphy>>8);
-       bcb->CDB[2]                     = (BYTE)(oldphy>>16);
+       bcb->CDB[2]                     = 0; /* (BYTE)(oldphy>>16) */
        bcb->CDB[7]                     = (BYTE)(newphy);
        bcb->CDB[6]                     = (BYTE)(newphy>>8);
-       bcb->CDB[5]                     = (BYTE)(newphy>>16);
+       bcb->CDB[5]                     = 0; /* (BYTE)(newphy>>16) */
        bcb->CDB[9]                     = (BYTE)(PhyBlockAddr);
        bcb->CDB[8]                     = (BYTE)(PhyBlockAddr>>8);
        bcb->CDB[10]            = PageNum;
@@ -786,7 +786,8 @@ int MS_LibErrorPhyBlock(struct us_data *us, WORD phyblk)
     MS_LibSetAcquiredErrorBlock(us, phyblk);
 
     if (MS_LibIsWritable(us))
-        return MS_LibOverwriteExtra(us, phyblk, 0, (BYTE)(~MS_REG_OVR_BKST));
+        return MS_LibOverwriteExtra(us, phyblk, 0,
+                               (BYTE)(~MS_REG_OVR_BKST & BYTE_MASK));
 
 
     return MS_STATUS_SUCCESS;