summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNishanth Menon2010-07-13 00:56:00 +0200
committerGreg Kroah-Hartman2010-07-22 19:50:15 +0200
commit86dd51e4c4d620dfe1aca584a1332b55f3a49c05 (patch)
tree51a7559e277d8a784dcf00b6d1a66a176eeab5c2
parentstaging: tidspbridge: remove custom TRUE FALSE (diff)
downloadkernel-qcow2-linux-86dd51e4c4d620dfe1aca584a1332b55f3a49c05.tar.gz
kernel-qcow2-linux-86dd51e4c4d620dfe1aca584a1332b55f3a49c05.tar.xz
kernel-qcow2-linux-86dd51e4c4d620dfe1aca584a1332b55f3a49c05.zip
staging: tidspbridge: no need for custom NULL
kernel has it's own NULL define, we dont need to introduce our own custom NULL type! Signed-off-by: Nishanth Menon <nm@ti.com> Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/tidspbridge/dynload/header.h4
-rw-r--r--drivers/staging/tidspbridge/hw/GlobalTypes.h9
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/dbtype.h8
-rw-r--r--drivers/staging/tidspbridge/include/dspbridge/std.h4
4 files changed, 0 insertions, 25 deletions
diff --git a/drivers/staging/tidspbridge/dynload/header.h b/drivers/staging/tidspbridge/dynload/header.h
index 04623f17574a..5b50a15a343e 100644
--- a/drivers/staging/tidspbridge/dynload/header.h
+++ b/drivers/staging/tidspbridge/dynload/header.h
@@ -14,10 +14,6 @@
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*/
-#ifndef NULL
-#define NULL 0
-#endif
-
#include <linux/string.h>
#define DL_STRCMP strcmp
diff --git a/drivers/staging/tidspbridge/hw/GlobalTypes.h b/drivers/staging/tidspbridge/hw/GlobalTypes.h
index c67c91be1a4e..4d142a180491 100644
--- a/drivers/staging/tidspbridge/hw/GlobalTypes.h
+++ b/drivers/staging/tidspbridge/hw/GlobalTypes.h
@@ -20,15 +20,6 @@
#define _GLOBALTYPES_H
/*
- * Definition: NULL
- *
- * DESCRIPTION: Invalid pointer
- */
-#ifndef NULL
-#define NULL (void *)0
-#endif
-
-/*
* Definition: RET_CODE_BASE
*
* DESCRIPTION: Base value for return code offsets
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
index 0b2cb93c050e..ca5eaf8a2985 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
@@ -42,14 +42,6 @@
#endif
/*===========================================================================*/
-/* NULL (Definition is language specific) */
-/*===========================================================================*/
-
-#ifndef NULL
-#define NULL ((void *)0) /* Null pointer. */
-#endif
-
-/*===========================================================================*/
/* NULL character (normally used for string termination) */
/*===========================================================================*/
diff --git a/drivers/staging/tidspbridge/include/dspbridge/std.h b/drivers/staging/tidspbridge/include/dspbridge/std.h
index 7e09fec18ee2..ca2827d92e2e 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/std.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/std.h
@@ -74,10 +74,6 @@
typedef s32(*fxn) (void); /* generic function type */
-#ifndef NULL
-#define NULL 0
-#endif
-
/*
* These macros are used to cast 'Arg' types to 's32' or 'Ptr'.
* These macros were added for the 55x since Arg is not the same