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>

diff --git a/drivers/staging/tidspbridge/dynload/header.h b/drivers/staging/tidspbridge/dynload/header.h
index 04623f17574ab3ef37f37c20296fa3c0f4a57d1a..5b50a15a343ee3212ae7e99eedfa896e7a87fcd6 100644 (file)
--- 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 c67c91be1a4e528e7603a4a1fb2584c4497a4101..4d142a180491a69c2d82ce73ab65ecd6fd1483f0 100644 (file)
--- a/drivers/staging/tidspbridge/hw/GlobalTypes.h
+++ b/drivers/staging/tidspbridge/hw/GlobalTypes.h
@@ -19,15 +19,6 @@
 #ifndef _GLOBALTYPES_H
 #define _GLOBALTYPES_H
 
-/*
- * Definition: NULL
- *
- * DESCRIPTION:  Invalid pointer
- */
-#ifndef NULL
-#define NULL   (void *)0
-#endif
-
 /*
  * Definition: RET_CODE_BASE
  *

diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
index 0b2cb93c050e7887dce3c1957a86325854dc5d49..ca5eaf8a2985bbcee20e7a5314c04ad90203db37 100644 (file)
--- a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
@@ -41,14 +41,6 @@
 #define CONST   const
 #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 7e09fec18ee26f50d28d4fd1f5d3139083bf9313..ca2827d92e2e6da6880d911d281d019071f451d0 100644 (file)
--- 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