Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-12 22:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

staging: ks7010: replace GetUInt32 macro with get_unaligned_le32

Browse Source 
This commit replaces custom GetUInt32 macro with get_unaligned_le32
which is included in the linux kernel.

Signed-off-by: Sergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sergio Paracuellos 2018-03-28 17:24:23 +02:00 committed by Greg Kroah-Hartman
parent 8da5b3e7f7
commit f7380a88da
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/ks7010/michael_mic.c
View File

@ -15,9 +15,6 @@
#include <asm/unaligned.h>
#include "michael_mic.h"
// 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))
// Reset the state to the empty message.
static inline void michael_clear(struct michael_mic_t *mic)
@ -30,8 +27,8 @@ static inline void michael_clear(struct michael_mic_t *mic)
static void michael_init(struct michael_mic_t *mic, uint8_t *key)
{
// Set the key
mic->k0 = getUInt32(key, 0);
mic->k1 = getUInt32(key, 4);
mic->k0 = get_unaligned_le32(key);
mic->k1 = get_unaligned_le32(key + 4);
//clear();
michael_clear(mic);
@ -65,13 +62,13 @@ static void michael_append(struct michael_mic_t *mic, uint8_t *src, int bytes)
if (mic->m_bytes < 4)
return;
mic->l ^= getUInt32(mic->m, 0);
mic->l ^= get_unaligned_le32(mic->m);
MichaelBlockFunction(mic->l, mic->r);
mic->m_bytes = 0;
}
while (bytes >= 4) {
mic->l ^= getUInt32(src, 0);
mic->l ^= get_unaligned_le32(src);
MichaelBlockFunction(mic->l, mic->r);
src += 4;
bytes -= 4;