diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 12:00:10 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 12:00:10 -0700 |
| commit | 8c87f69acf942222d8e2ead6d0ca144957141284 (patch) | |
| tree | 3efb5fee94255eccc259f35efb71cb5202d4b271 /drivers/staging/csr/csr_macro.h | |
| parent | staging: csr: remove CsrInt8 typedef (diff) | |
| download | linux-dev-8c87f69acf942222d8e2ead6d0ca144957141284.tar.xz linux-dev-8c87f69acf942222d8e2ead6d0ca144957141284.zip | |
staging: csr: remove CsrUint16 typedef
Use the in-kernel u16 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>
Diffstat (limited to 'drivers/staging/csr/csr_macro.h')
| -rw-r--r-- | drivers/staging/csr/csr_macro.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/staging/csr/csr_macro.h b/drivers/staging/csr/csr_macro.h index e8de0a7bab99..7656e2ac5d56 100644 --- a/drivers/staging/csr/csr_macro.h +++ b/drivers/staging/csr/csr_macro.h @@ -31,7 +31,7 @@ extern "C" { /*------------------------------------------------------------------*/ /* Endian conversion */ /*------------------------------------------------------------------*/ -#define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr) (((CsrUint16) ((u8 *) (ptr))[0]) | ((CsrUint16) ((u8 *) (ptr))[1]) << 8) +#define CSR_GET_UINT16_FROM_LITTLE_ENDIAN(ptr) (((u16) ((u8 *) (ptr))[0]) | ((u16) ((u8 *) (ptr))[1]) << 8) #define CSR_GET_UINT32_FROM_LITTLE_ENDIAN(ptr) (((CsrUint32) ((u8 *) (ptr))[0]) | ((CsrUint32) ((u8 *) (ptr))[1]) << 8 | \ ((CsrUint32) ((u8 *) (ptr))[2]) << 16 | ((CsrUint32) ((u8 *) (ptr))[3]) << 24) #define CSR_COPY_UINT16_TO_LITTLE_ENDIAN(uint, ptr) ((u8 *) (ptr))[0] = ((u8) ((uint) & 0x00FF)); \ @@ -40,7 +40,7 @@ extern "C" { ((u8 *) (ptr))[1] = ((u8) (((uint) >> 8) & 0x000000FF)); \ ((u8 *) (ptr))[2] = ((u8) (((uint) >> 16) & 0x000000FF)); \ ((u8 *) (ptr))[3] = ((u8) (((uint) >> 24) & 0x000000FF)) -#define CSR_GET_UINT16_FROM_BIG_ENDIAN(ptr) (((CsrUint16) ((u8 *) (ptr))[1]) | ((CsrUint16) ((u8 *) (ptr))[0]) << 8) +#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_UINT32_FROM_BIG_ENDIAN(ptr) (((CsrUint32) ((u8 *) (ptr))[3]) | ((CsrUint32) ((u8 *) (ptr))[2]) << 8 | \ @@ -66,8 +66,8 @@ extern "C" { (output) = ((u8) (input));(input) += 2 #define CSR_CONVERT_16_FROM_XAP(output, input) \ - (output) = (CsrUint16) ((((CsrUint16) (input)[1]) << 8) | \ - ((CsrUint16) (input)[0]));(input) += 2 + (output) = (u16) ((((u16) (input)[1]) << 8) | \ + ((u16) (input)[0]));(input) += 2 #define CSR_CONVERT_32_FROM_XAP(output, input) \ (output) = (((CsrUint32) (input)[1]) << 24) | \ |