[PATCH 04/12] staging: ks7010: replace macro MichaelClear with inline function

Sergio Paracuellos sergio.paracuellos at gmail.com
Wed Mar 28 15:24:20 UTC 2018


This commit replaces MichaelClear macro with similar inline function
renaming it to michael_clear.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos at gmail.com>
---
 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 276ecd9..af36b12d 100644
--- a/drivers/staging/ks7010/michael_mic.c
+++ b/drivers/staging/ks7010/michael_mic.c
@@ -28,12 +28,12 @@ do {								\
 } while (0)
 
 // Reset the state to the empty message.
-#define MichaelClear(A)			\
-do {					\
-	A->l = A->k0;			\
-	A->r = A->k1;			\
-	A->m_bytes = 0;		\
-} while (0)
+static inline void michael_clear(struct michael_mic_t *mic)
+{
+	mic->l = mic->k0;
+	mic->r = mic->k1;
+	mic->m_bytes = 0;
+}
 
 static void michael_init(struct michael_mic_t *mic, uint8_t *key)
 {
@@ -42,7 +42,7 @@ static void michael_init(struct michael_mic_t *mic, uint8_t *key)
 	mic->k1 = getUInt32(key, 4);
 
 	//clear();
-	MichaelClear(mic);
+	michael_clear(mic);
 }
 
 #define MichaelBlockFunction(L, R)				\
@@ -118,7 +118,7 @@ void MichaelGetMIC(struct michael_mic_t *Mic, uint8_t *dst)
 	putUInt32(dst, 4, Mic->r);
 
 	// Reset to the empty message.
-	MichaelClear(Mic);
+	michael_clear(Mic);
 }
 
 void michael_mic_function(struct michael_mic_t *mic, u8 *key,
-- 
2.7.4



More information about the devel mailing list