[PATCH] fix coding style

[Jiong Du]

---
 drivers/staging/ks7010/michael_mic.c | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/ks7010/michael_mic.c 
b/drivers/staging/ks7010/michael_mic.c
index 78ae2b8..24aaa83 100644
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -14,10 +14,11 @@
 #include "michael_mic.h"
 
 // Rotation functions on 32 bit values
-#define ROL32( A, n )  ( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 
) ) )
-#define ROR32( A, n )  ROL32( (A), 32-(n) )
+#define ROL32(A, n) (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
+#define ROR32(A, n) ROL32((A), 32-(n))
 // Convert from Byte[] to UInt32 in a portable way
-#define getUInt32( A, B )  (uint32_t)(A[B+0] << 0) + (A[B+1] << 8) + 
(A[B+2] << 16) + (A[B+3] << 24)
+#define getUInt32(A, B) ((uint32_t)(A[B+0] << 0) + \
+   (A[B+1] << 8) + (A[B+2] << 16) + (A[B+3] << 24))
 
 // Convert from UInt32 to Byte[] in a portable way
 #define putUInt32(A, B, C) \
@@ -48,21 +49,22 @@ void MichaelInitializeFunction(struct michel_mic_t *Mic, 
uint8_t *key)
 }
 
 #define MichaelBlockFunction(L, R) \
-do{\
-   R ^= ROL32( L, 17 );\
+do {   \
+   R ^= ROL32(L, 17);  \
L += R; \
R ^= ((L & 0xff00ff00) >> 8) | ((L & 0x00ff00ff) << 8); \
L += R; \
-   R ^= ROL32( L, 3 ); \
+   R ^= ROL32(L, 3);   \
L += R; \
-   R ^= ROR32( L, 2 ); \
+   R ^= ROR32(L, 2);   \
L += R; \
-}while(0)
+} while (0)
 
 static
 void MichaelAppend(struct michel_mic_t *Mic, uint8_t *src, int nBytes)
 {
int addlen;
+
if (Mic->nBytesInM) {
addlen = 4 - Mic->nBytesInM;
if (addlen > nBytes)
@@ -97,6 +99,7 @@ static
 void MichaelGetMIC(struct michel_mic_t *Mic, uint8_t *dst)
 {
uint8_t *data = Mic->M;
+
switch (Mic->nBytesInM) {
case 0:
Mic->L ^= 0x5a;
-- 
2.10.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 2/2] staging: ks7010: fix coding style

[Jiong Du]

Fixes all the checkpath errors/warnings for michael_mic.c:
space required before the open brace
no space before tabs
line over 80 characters
space required before the open brace '{'
space required after that close brace '}'
space prohibited after that open parenthesis '('
space prohibited before that close parenthesis ')'
Missing a blank line after declarations

Signed-off-by: Jiong Du 
---
 drivers/staging/ks7010/michael_mic.c | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/ks7010/michael_mic.c 
b/drivers/staging/ks7010/michael_mic.c
index 78ae2b8..24aaa83 100644
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -14,10 +14,11 @@
 #include "michael_mic.h"
 
 // Rotation functions on 32 bit values
-#define ROL32( A, n )  ( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 
) ) )
-#define ROR32( A, n )  ROL32( (A), 32-(n) )
+#define ROL32(A, n) (((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
+#define ROR32(A, n) ROL32((A), 32-(n))
 // Convert from Byte[] to UInt32 in a portable way
-#define getUInt32( A, B )  (uint32_t)(A[B+0] << 0) + (A[B+1] << 8) + 
(A[B+2] << 16) + (A[B+3] << 24)
+#define getUInt32(A, B) ((uint32_t)(A[B+0] << 0) + \
+   (A[B+1] << 8) + (A[B+2] << 16) + (A[B+3] << 24))
 
 // Convert from UInt32 to Byte[] in a portable way
 #define putUInt32(A, B, C) \
@@ -48,21 +49,22 @@ void MichaelInitializeFunction(struct michel_mic_t *Mic, 
uint8_t *key)
 }
 
 #define MichaelBlockFunction(L, R) \
-do{\
-   R ^= ROL32( L, 17 );\
+do {   \
+   R ^= ROL32(L, 17);  \
L += R; \
R ^= ((L & 0xff00ff00) >> 8) | ((L & 0x00ff00ff) << 8); \
L += R; \
-   R ^= ROL32( L, 3 ); \
+   R ^= ROL32(L, 3);   \
L += R; \
-   R ^= ROR32( L, 2 ); \
+   R ^= ROR32(L, 2);   \
L += R; \
-}while(0)
+} while (0)
 
 static
 void MichaelAppend(struct michel_mic_t *Mic, uint8_t *src, int nBytes)
 {
int addlen;
+
if (Mic->nBytesInM) {
addlen = 4 - Mic->nBytesInM;
if (addlen > nBytes)
@@ -97,6 +99,7 @@ static
 void MichaelGetMIC(struct michel_mic_t *Mic, uint8_t *dst)
 {
uint8_t *data = Mic->M;
+
switch (Mic->nBytesInM) {
case 0:
Mic->L ^= 0x5a;
-- 
2.10.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 1/2] staging: ks7010: Remove trailing whitespace

[Jiong Du]

Fixes checkpatch error: tailing whitespace

Signed-off-by: Jiong Du 
---
 drivers/staging/ks7010/michael_mic.h | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/ks7010/michael_mic.h 
b/drivers/staging/ks7010/michael_mic.h
index efaa217..9f6d23a 100644
--- a/drivers/staging/ks7010/michael_mic.h
+++ b/drivers/staging/ks7010/michael_mic.h
@@ -11,12 +11,12 @@
 
 /* MichelMIC routine define */
 struct michel_mic_t {
-   uint32_t K0;// Key 
-   uint32_t K1;// Key 
-   uint32_t L; // Current state 
-   uint32_t R; // Current state 
-   uint8_t M[4];   // Message accumulator (single word) 
-   int nBytesInM;  // # bytes in M 
+   uint32_t K0;// Key
+   uint32_t K1;// Key
+   uint32_t L; // Current state
+   uint32_t R; // Current state
+   uint8_t M[4];   // Message accumulator (single word)
+   int nBytesInM;  // # bytes in M
uint8_t Result[8];
 };
 
-- 
2.10.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 1/5] staging: ks7010: fix spacing errors

[Jiong Du]

Fixes checkpatch errors: spacing errors

Signed-off-by: Jiong Du 
---
 drivers/staging/ks7010/michael_mic.c | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/ks7010/michael_mic.c 
b/drivers/staging/ks7010/michael_mic.c
index 78ae2b8..fadc563 100644
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -14,10 +14,10 @@
 #include "michael_mic.h"
 
 // Rotation functions on 32 bit values
-#define ROL32( A, n )  ( ((A) << (n)) | ( ((A)>>(32-(n))) & ( (1UL << (n)) - 1 
) ) )
-#define ROR32( A, n )  ROL32( (A), 32-(n) )
+#define ROL32(A, n)(((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
+#define ROR32(A, n)ROL32((A), 32-(n))
 // Convert from Byte[] to UInt32 in a portable way
-#define getUInt32( A, B )  (uint32_t)(A[B+0] << 0) + (A[B+1] << 8) + 
(A[B+2] << 16) + (A[B+3] << 24)
+#define getUInt32(A, B)(uint32_t)(A[B+0] << 0) + (A[B+1] << 8) + 
(A[B+2] << 16) + (A[B+3] << 24)
 
 // Convert from UInt32 to Byte[] in a portable way
 #define putUInt32(A, B, C) \
@@ -48,16 +48,16 @@ void MichaelInitializeFunction(struct michel_mic_t *Mic, 
uint8_t *key)
 }
 
 #define MichaelBlockFunction(L, R) \
-do{\
-   R ^= ROL32( L, 17 );\
+do {   \
+   R ^= ROL32(L, 17);  \
L += R; \
R ^= ((L & 0xff00ff00) >> 8) | ((L & 0x00ff00ff) << 8); \
L += R; \
-   R ^= ROL32( L, 3 ); \
+   R ^= ROL32(L, 3);   \
L += R; \
-   R ^= ROR32( L, 2 ); \
+   R ^= ROR32(L, 2);   \
L += R; \
-}while(0)
+} while (0)
 
 static
 void MichaelAppend(struct michel_mic_t *Mic, uint8_t *src, int nBytes)
-- 
2.10.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 5/5] staging: ks7010: add a blank line after declarations

[Jiong Du]

Fixes checkpatch warning: Missing a blank line after declarations

Signed-off-by: Jiong Du 
---
 drivers/staging/ks7010/michael_mic.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/staging/ks7010/michael_mic.c 
b/drivers/staging/ks7010/michael_mic.c
index 5f3c1496..f1064c1 100644
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -64,6 +64,7 @@ static
 void MichaelAppend(struct michel_mic_t *Mic, uint8_t *src, int nBytes)
 {
int addlen;
+
if (Mic->nBytesInM) {
addlen = 4 - Mic->nBytesInM;
if (addlen > nBytes)
@@ -98,6 +99,7 @@ static
 void MichaelGetMIC(struct michel_mic_t *Mic, uint8_t *dst)
 {
uint8_t *data = Mic->M;
+
switch (Mic->nBytesInM) {
case 0:
Mic->L ^= 0x5a;
-- 
2.10.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 3/5] staging: ks7010: remove space before tab

[Jiong Du]

Fixes checkpatch warning: space before tabs

Signed-off-by: Jiong Du 
---
 drivers/staging/ks7010/michael_mic.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/ks7010/michael_mic.c 
b/drivers/staging/ks7010/michael_mic.c
index 09202ad..50e158f 100644
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -14,10 +14,10 @@
 #include "michael_mic.h"
 
 // Rotation functions on 32 bit values
-#define ROL32(A, n)(((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
-#define ROR32(A, n)ROL32((A), 32-(n))
+#define ROL32(A, n)(((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
+#define ROR32(A, n)ROL32((A), 32-(n))
 // Convert from Byte[] to UInt32 in a portable way
-#define getUInt32(A, B)((uint32_t)(A[B+0] << 0) + (A[B+1] << 8) + 
(A[B+2] << 16) + (A[B+3] << 24))
+#define getUInt32(A, B)((uint32_t)(A[B+0] << 0) + (A[B+1] << 8) + 
(A[B+2] << 16) + (A[B+3] << 24))
 
 // Convert from UInt32 to Byte[] in a portable way
 #define putUInt32(A, B, C) \
-- 
2.10.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 2/5] staging: ks7010: fix complex macro error

[Jiong Du]

Fixes checkpatch error: Macros with complex values should be enclosed in 
parentheses

Signed-off-by: Jiong Du 
---
 drivers/staging/ks7010/michael_mic.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/ks7010/michael_mic.c 
b/drivers/staging/ks7010/michael_mic.c
index fadc563..09202ad 100644
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -17,7 +17,7 @@
 #define ROL32(A, n)(((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
 #define ROR32(A, n)ROL32((A), 32-(n))
 // Convert from Byte[] to UInt32 in a portable way
-#define getUInt32(A, B)(uint32_t)(A[B+0] << 0) + (A[B+1] << 8) + 
(A[B+2] << 16) + (A[B+3] << 24)
+#define getUInt32(A, B)((uint32_t)(A[B+0] << 0) + (A[B+1] << 8) + 
(A[B+2] << 16) + (A[B+3] << 24))
 
 // Convert from UInt32 to Byte[] in a portable way
 #define putUInt32(A, B, C) \
-- 
2.10.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

[PATCH 4/5] staging: ks7010: split long line

[Jiong Du]

Fixes checkpatch warning: line over 80 characters

Signed-off-by: Jiong Du 
---
 drivers/staging/ks7010/michael_mic.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/ks7010/michael_mic.c 
b/drivers/staging/ks7010/michael_mic.c
index 50e158f..5f3c1496 100644
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -17,7 +17,8 @@
 #define ROL32(A, n)(((A) << (n)) | (((A)>>(32-(n))) & ((1UL << (n)) - 1)))
 #define ROR32(A, n)ROL32((A), 32-(n))
 // Convert from Byte[] to UInt32 in a portable way
-#define getUInt32(A, B)((uint32_t)(A[B+0] << 0) + (A[B+1] << 8) + 
(A[B+2] << 16) + (A[B+3] << 24))
+#define getUInt32(A, B)((uint32_t)(A[B+0] << 0) \
+   + (A[B+1] << 8) + (A[B+2] << 16) + (A[B+3] << 24))
 
 // Convert from UInt32 to Byte[] in a portable way
 #define putUInt32(A, B, C) \
-- 
2.10.1

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel