diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/csr/csr_types.h | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/drivers/staging/csr/csr_types.h b/drivers/staging/csr/csr_types.h index 23193ea4429..e736a78da43 100644 --- a/drivers/staging/csr/csr_types.h +++ b/drivers/staging/csr/csr_types.h @@ -10,19 +10,11 @@ *****************************************************************************/ -#ifdef __KERNEL__ #include <linux/stddef.h> #include <linux/kernel.h> #include <linux/types.h> -#include <asm/byteorder.h> #include <linux/string.h> -#else -#include <stdint.h> -#include <stddef.h> -#include <sys/types.h> -#include <stdarg.h> -#include <string.h> -#endif +#include <asm/byteorder.h> #ifdef __cplusplus extern "C" { @@ -38,11 +30,7 @@ extern "C" { typedef size_t CsrSize; /* Return type of sizeof (ISO/IEC 9899:1990 7.1.6) */ typedef ptrdiff_t CsrPtrdiff; /* Type of the result of subtracting two pointers (ISO/IEC 9899:1990 7.1.6) */ typedef uintptr_t CsrUintptr; /* Unsigned integer large enough to hold any pointer (ISO/IEC 9899:1999 7.18.1.4) */ -#ifdef __KERNEL__ typedef ptrdiff_t CsrIntptr; /* intptr_t is not defined in kernel. Use the equivalent ptrdiff_t. */ -#else -typedef intptr_t CsrIntptr; /* Signed integer large enough to hold any pointer (ISO/IEC 9899:1999 7.18.1.4) */ -#endif /* Unsigned fixed width types */ typedef uint8_t CsrUint8; @@ -75,17 +63,6 @@ typedef CsrUint32 CsrUint24; typedef uint64_t CsrUint64; typedef int64_t CsrInt64; -/* - * Floating point - * - * Note: If a given compiler does not support floating point, it is - * OK to omit these definitions; alternative versions of the code using - * these types may be available. Consult the relevant documentation - * or the customer support group for information on this. - */ -#define CSR_HAVE_FLOATING_POINT -typedef float CsrFloat; -typedef double CsrDouble; #ifdef __cplusplus } |