diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 23:14:51 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 23:14:51 +0400 |
| commit | 9d25edfca7db9404d821c4558e06a2bb98981240 (patch) | |
| tree | aa521eaea659438d1de04327f4755561b44d96dc | |
| parent | 95e326c28aa66d6ff5821f3c1d22b46a8d335939 (diff) | |
| download | linux-9d25edfca7db9404d821c4558e06a2bb98981240.tar.xz | |
staging: csr: remove CsrUint24 typedef
Use the in-kernel u32 type instead.
Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/csr/csr_macro.h | 4 | ||||
| -rw-r--r-- | drivers/staging/csr/csr_types.h | 1 | ||||
| -rw-r--r-- | drivers/staging/csr/csr_wifi_hip_sigs.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h index 92cdb8d37f54..214d6a3075e3 100644 --- a/drivers/staging/csr/csr_macro.h +++ b/drivers/staging/csr/csr_macro.h @@ -41,8 +41,8 @@ extern "C" { ((u8 *) (ptr))[2] = ((u8) (((uint) >> 16) & 0x000000FF)); \ ((u8 *) (ptr))[3] = ((u8) (((uint) >> 24) & 0x000000FF)) #define CSR_GET_UINT16_FROM_BIG_ENDIAN(ptr) (((u16) ((u8 *) (ptr))[1]) | ((u16) ((u8 *) (ptr))[0]) << 8) -#define CSR_GET_UINT24_FROM_BIG_ENDIAN(ptr) (((CsrUint24) ((u8 *) (ptr))[2]) | \ - ((CsrUint24) ((u8 *) (ptr))[1]) << 8 | ((CsrUint24) ((u8 *) (ptr))[0]) << 16) +#define CSR_GET_UINT24_FROM_BIG_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[2]) | \ + ((u32) ((u8 *) (ptr))[1]) << 8 | ((u32) ((u8 *) (ptr))[0]) << 16) #define CSR_GET_UINT32_FROM_BIG_ENDIAN(ptr) (((u32) ((u8 *) (ptr))[3]) | ((u32) ((u8 *) (ptr))[2]) << 8 | \ ((u32) ((u8 *) (ptr))[1]) << 16 | ((u32) ((u8 *) (ptr))[0]) << 24) #define CSR_COPY_UINT16_TO_BIG_ENDIAN(uint, ptr) ((u8 *) (ptr))[1] = ((u8) ((uint) & 0x00FF)); \ diff --git a/drivers/staging/csr/csr_types.h b/drivers/staging/csr/csr_types.h index deaecb6c8308..659343b19d87 100644 --- a/drivers/staging/csr/csr_types.h +++ b/drivers/staging/csr/csr_types.h @@ -39,7 +39,6 @@ typedef u8 CsrBool; typedef char CsrCharString; typedef u8 CsrUtf8String; typedef u16 CsrUtf16String; /* 16-bit UTF16 strings */ -typedef u32 CsrUint24; /* * 64-bit integers diff --git a/drivers/staging/csr/csr_wifi_hip_sigs.h b/drivers/staging/csr/csr_wifi_hip_sigs.h index a483179b65ae..2b9f51d7f296 100644 --- a/drivers/staging/csr/csr_wifi_hip_sigs.h +++ b/drivers/staging/csr/csr_wifi_hip_sigs.h @@ -429,7 +429,7 @@ typedef u16 CSR_DIALOG_TOKEN; typedef struct CSR_GENERIC_POINTER { - CsrUint24 MemoryOffset; + u32 MemoryOffset; CSR_MEMORY_SPACE MemorySpace; } CSR_GENERIC_POINTER; |