[PATCH 00/11] staging: tidspbridge: header cleanup series

[PATCH 00/11] staging: tidspbridge: header cleanup series

[Nishanth Menon]

Series targetted to remove std.h, GlobalTypes.h and dbdefs.h. These
introduce custom types and macros which dont make sense for linux kernel

Nishanth Menon (11):
  staging: tidspbridge: remove custom TRUE FALSE
  staging: tidspbridge: no need for custom NULL
  staging: tidspbridge: remove std.h
  staging: tidspbridge: remove custom typedef reg_uword32
  staging: tidspbridge: remove RET_OK RET_FAIL
  staging: tidspbridge: remove GlobalTypes.h
  staging: tidspbridge: replace CONST with c standard const
  staging: tidspbridge: remove IN modifier
  staging: tidspbridge: remove OPTIONAL
  staging: tidspbridge: remove OUT define
  staging: tidspbridge: remove dbdefs.h

 drivers/staging/tidspbridge/core/_tiomap_pwr.h     |   14 +-
 drivers/staging/tidspbridge/core/chnl_sm.c         |   23 +-
 drivers/staging/tidspbridge/core/dsp-clock.c       |    7 +-
 drivers/staging/tidspbridge/core/io_sm.c           |   28 +-
 drivers/staging/tidspbridge/core/msg_sm.c          |    8 +-
 drivers/staging/tidspbridge/core/tiomap3430.c      |   64 ++---
 drivers/staging/tidspbridge/core/tiomap3430_pwr.c  |  140 +++------
 drivers/staging/tidspbridge/core/tiomap_io.c       |    8 +-
 drivers/staging/tidspbridge/core/tiomap_io.h       |   14 +-
 drivers/staging/tidspbridge/core/wdt.c             |    2 +-
 drivers/staging/tidspbridge/dynload/cload.c        |    2 +-
 .../staging/tidspbridge/dynload/dload_internal.h   |    3 -
 drivers/staging/tidspbridge/dynload/header.h       |    6 -
 .../tidspbridge/dynload/tramp_table_c6000.c        |    2 +-
 drivers/staging/tidspbridge/gen/gb.c               |    4 +-
 drivers/staging/tidspbridge/gen/gh.c               |    2 +-
 drivers/staging/tidspbridge/gen/gs.c               |    2 +-
 drivers/staging/tidspbridge/gen/uuidutil.c         |    8 +-
 drivers/staging/tidspbridge/hw/GlobalTypes.h       |  308 --------------------
 drivers/staging/tidspbridge/hw/MMURegAcM.h         |    1 -
 drivers/staging/tidspbridge/hw/hw_defs.h           |    2 -
 drivers/staging/tidspbridge/hw/hw_mmu.c            |   85 ++----
 .../staging/tidspbridge/include/dspbridge/cfg.h    |   28 +-
 .../staging/tidspbridge/include/dspbridge/chnl.h   |    4 +-
 .../staging/tidspbridge/include/dspbridge/clk.h    |    4 +-
 .../staging/tidspbridge/include/dspbridge/cmm.h    |   14 +-
 .../staging/tidspbridge/include/dspbridge/cod.h    |   20 +-
 .../staging/tidspbridge/include/dspbridge/dbdcd.h  |   74 +++---
 .../tidspbridge/include/dspbridge/dbdcddef.h       |    6 +-
 .../staging/tidspbridge/include/dspbridge/dbdefs.h |    2 -
 .../staging/tidspbridge/include/dspbridge/dbtype.h |   88 ------
 .../staging/tidspbridge/include/dspbridge/dev.h    |   46 ++--
 .../staging/tidspbridge/include/dspbridge/disp.h   |    8 +-
 .../staging/tidspbridge/include/dspbridge/dmm.h    |    6 +-
 .../staging/tidspbridge/include/dspbridge/drv.h    |   16 +-
 .../tidspbridge/include/dspbridge/dspapi-ioctl.h   |    2 +-
 .../tidspbridge/include/dspbridge/dspchnl.h        |   16 +-
 .../tidspbridge/include/dspbridge/dspdefs.h        |   44 ++--
 .../staging/tidspbridge/include/dspbridge/dspdrv.h |    2 +-
 .../staging/tidspbridge/include/dspbridge/dspio.h  |    8 +-
 .../staging/tidspbridge/include/dspbridge/dspmsg.h |    6 +-
 .../tidspbridge/include/dspbridge/host_os.h        |    1 -
 drivers/staging/tidspbridge/include/dspbridge/io.h |    4 +-
 .../staging/tidspbridge/include/dspbridge/io_sm.h  |   10 +-
 .../staging/tidspbridge/include/dspbridge/mgr.h    |   16 +-
 .../staging/tidspbridge/include/dspbridge/msg.h    |    2 +-
 .../staging/tidspbridge/include/dspbridge/nldr.h   |   12 +-
 .../tidspbridge/include/dspbridge/nldrdefs.h       |   10 +-
 .../staging/tidspbridge/include/dspbridge/node.h   |   40 ++--
 .../tidspbridge/include/dspbridge/nodepriv.h       |    2 +-
 .../staging/tidspbridge/include/dspbridge/proc.h   |   18 +-
 .../staging/tidspbridge/include/dspbridge/pwr.h    |    8 +-
 .../tidspbridge/include/dspbridge/rmstypes.h       |    4 -
 .../staging/tidspbridge/include/dspbridge/std.h    |   94 ------
 .../staging/tidspbridge/include/dspbridge/strm.h   |   22 +-
 .../tidspbridge/include/dspbridge/uuidutil.h       |    6 +-
 drivers/staging/tidspbridge/pmgr/chnl.c            |    6 +-
 drivers/staging/tidspbridge/pmgr/cmm.c             |   16 +-
 drivers/staging/tidspbridge/pmgr/cod.c             |   21 +-
 drivers/staging/tidspbridge/pmgr/dbll.c            |    6 +-
 drivers/staging/tidspbridge/pmgr/dev.c             |   38 ++--
 drivers/staging/tidspbridge/pmgr/dmm.c             |   10 +-
 drivers/staging/tidspbridge/pmgr/dspapi.c          |    6 +-
 drivers/staging/tidspbridge/pmgr/io.c              |    6 +-
 drivers/staging/tidspbridge/pmgr/msg.c             |    4 +-
 drivers/staging/tidspbridge/rmgr/dbdcd.c           |   94 +++---
 drivers/staging/tidspbridge/rmgr/disp.c            |   12 +-
 drivers/staging/tidspbridge/rmgr/drv.c             |    8 +-
 drivers/staging/tidspbridge/rmgr/drv_interface.c   |    2 +-
 drivers/staging/tidspbridge/rmgr/dspdrv.c          |    4 +-
 drivers/staging/tidspbridge/rmgr/mgr.c             |   17 +-
 drivers/staging/tidspbridge/rmgr/nldr.c            |   25 +-
 drivers/staging/tidspbridge/rmgr/node.c            |   52 ++--
 drivers/staging/tidspbridge/rmgr/proc.c            |   20 +-
 drivers/staging/tidspbridge/rmgr/pwr.c             |    8 +-
 drivers/staging/tidspbridge/rmgr/rmm.c             |    3 +-
 drivers/staging/tidspbridge/rmgr/strm.c            |   21 +-
 drivers/staging/tidspbridge/services/cfg.c         |   11 +-
 drivers/staging/tidspbridge/services/services.c    |    3 +-
 79 files changed, 587 insertions(+), 1182 deletions(-)
 delete mode 100644 drivers/staging/tidspbridge/hw/GlobalTypes.h
 delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbtype.h
 delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/std.h

 Regards,
 Nishanth Menon

[PATCH 01/11] staging: tidspbridge: remove custom TRUE FALSE

[Nishanth Menon]

bool has standard true and false, we dont need to introduce
our own TRUE and FALSE macros.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 drivers/staging/tidspbridge/core/tiomap3430.c      |    6 +++---
 .../staging/tidspbridge/dynload/dload_internal.h   |    3 ---
 drivers/staging/tidspbridge/dynload/header.h       |    2 --
 drivers/staging/tidspbridge/gen/gb.c               |    2 +-
 drivers/staging/tidspbridge/hw/GlobalTypes.h       |   10 ----------
 .../staging/tidspbridge/include/dspbridge/dbtype.h |   11 -----------
 drivers/staging/tidspbridge/pmgr/dbll.c            |    4 ++--
 drivers/staging/tidspbridge/pmgr/dmm.c             |    2 +-
 drivers/staging/tidspbridge/rmgr/node.c            |    2 +-
 9 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 60fca91..25c1271 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -1863,10 +1863,10 @@ bool wait_for_start(struct bridge_dev_context *dev_context, u32 dw_sync_addr)
 	while (*((volatile u16 *)dw_sync_addr) && --timeout)
 		udelay(10);
 
-	/*  If timed out: return FALSE */
+	/*  If timed out: return false */
 	if (!timeout) {
 		pr_err("%s: Timed out waiting DSP to Start\n", __func__);
-		return FALSE;
+		return false;
 	}
-	return TRUE;
+	return true;
 }
diff --git a/drivers/staging/tidspbridge/dynload/dload_internal.h b/drivers/staging/tidspbridge/dynload/dload_internal.h
index 8037561..5a17e6c 100644
--- a/drivers/staging/tidspbridge/dynload/dload_internal.h
+++ b/drivers/staging/tidspbridge/dynload/dload_internal.h
@@ -23,9 +23,6 @@
  * Internal state definitions for the dynamic loader
  */
 
-#define TRUE 1
-#define FALSE 0
-
 /* type used for relocation intermediate results */
 typedef s32 rvalue;
 
diff --git a/drivers/staging/tidspbridge/dynload/header.h b/drivers/staging/tidspbridge/dynload/header.h
index 5cef360..04623f1 100644
--- a/drivers/staging/tidspbridge/dynload/header.h
+++ b/drivers/staging/tidspbridge/dynload/header.h
@@ -14,8 +14,6 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#define TRUE 1
-#define FALSE 0
 #ifndef NULL
 #define NULL 0
 #endif
diff --git a/drivers/staging/tidspbridge/gen/gb.c b/drivers/staging/tidspbridge/gen/gb.c
index f1a9dd3..d007233 100644
--- a/drivers/staging/tidspbridge/gen/gb.c
+++ b/drivers/staging/tidspbridge/gen/gb.c
@@ -161,7 +161,7 @@ bool gb_test(struct gb_t_map *map, u32 bitn)
 
 	mask = 1L << (bitn % BITS_PER_LONG);
 	word = map->words[bitn / BITS_PER_LONG];
-	state = word & mask ? TRUE : FALSE;
+	state = word & mask ? true : false;
 
 	return state;
 }
diff --git a/drivers/staging/tidspbridge/hw/GlobalTypes.h b/drivers/staging/tidspbridge/hw/GlobalTypes.h
index 9b55150..ba045eb 100644
--- a/drivers/staging/tidspbridge/hw/GlobalTypes.h
+++ b/drivers/staging/tidspbridge/hw/GlobalTypes.h
@@ -20,16 +20,6 @@
 #define _GLOBALTYPES_H
 
 /*
- * Definition: TRUE, FALSE
- *
- * DESCRIPTION:  Boolean Definitions
- */
-#ifndef TRUE
-#define FALSE	0
-#define TRUE	(!(FALSE))
-#endif
-
-/*
  * Definition: NULL
  *
  * DESCRIPTION:  Invalid pointer
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
index de65a82..0b2cb93 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
@@ -42,17 +42,6 @@
 #endif
 
 /*===========================================================================*/
-/*  Boolean constants */
-/*===========================================================================*/
-
-#ifndef FALSE
-#define FALSE   0
-#endif
-#ifndef TRUE
-#define TRUE    1
-#endif
-
-/*===========================================================================*/
 /*  NULL    (Definition is language specific) */
 /*===========================================================================*/
 
diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c
index 3636aa3..3a50071 100644
--- a/drivers/staging/tidspbridge/pmgr/dbll.c
+++ b/drivers/staging/tidspbridge/pmgr/dbll.c
@@ -1225,7 +1225,7 @@ static int dbll_rmm_alloc(struct dynamic_loader_allocate *this,
 	int status = 0;
 	u32 mem_sect_type;
 	struct rmm_addr rmm_addr_obj;
-	s32 ret = TRUE;
+	s32 ret = true;
 	unsigned stype = DLOAD_SECTION_TYPE(info->type);
 	char *token = NULL;
 	char *sz_sec_last_token = NULL;
@@ -1314,7 +1314,7 @@ func_cont:
 						    rmm_handle, mem_sect_type,
 						    alloc_size, align,
 						    (u32 *) &rmm_addr_obj,
-						    seg_id, req, FALSE);
+						    seg_id, req, false);
 	}
 	if (DSP_FAILED(status)) {
 		ret = false;
diff --git a/drivers/staging/tidspbridge/pmgr/dmm.c b/drivers/staging/tidspbridge/pmgr/dmm.c
index e0be8e0..e211ec5 100644
--- a/drivers/staging/tidspbridge/pmgr/dmm.c
+++ b/drivers/staging/tidspbridge/pmgr/dmm.c
@@ -503,7 +503,7 @@ u32 dmm_mem_map_dump(struct dmm_object *dmm_mgr)
 		for (i = 0; i < table_size; i +=
 		     virtual_mapping_table[i].region_size) {
 			curr_node = virtual_mapping_table + i;
-			if (curr_node->reserved == TRUE) {
+			if (curr_node->reserved) {
 				/*printk("RESERVED size = 0x%x, "
 				   "Map size = 0x%x\n",
 				   (curr_node->region_size * PG_SIZE4K),
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 1870b80..9a46edc 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -2620,7 +2620,7 @@ static void delete_node(struct node_object *hnode,
 
 	/* Free all SM address translator resources */
 	if (xlator) {
-		(void)cmm_xlator_delete(xlator, TRUE);	/* force free */
+		(void)cmm_xlator_delete(xlator, true);	/* force free */
 		xlator = NULL;
 	}
 
-- 
1.6.3.3

[PATCH 02/11] staging: tidspbridge: no need for custom NULL

[Nishanth Menon]

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>
---
 drivers/staging/tidspbridge/dynload/header.h       |    4 ----
 drivers/staging/tidspbridge/hw/GlobalTypes.h       |    9 ---------
 .../staging/tidspbridge/include/dspbridge/dbtype.h |    8 --------
 .../staging/tidspbridge/include/dspbridge/std.h    |    4 ----
 4 files changed, 0 insertions(+), 25 deletions(-)

diff --git a/drivers/staging/tidspbridge/dynload/header.h b/drivers/staging/tidspbridge/dynload/header.h
index 04623f1..5b50a15 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 ba045eb..2f8e69b 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 0b2cb93..ca5eaf8 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 7e09fec..ca2827d 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
-- 
1.6.3.3

[PATCH 03/11] staging: tidspbridge: remove std.h

[Nishanth Menon]

std.h introduces _TI_ _FLOAT_ _FIXED_ _TARGET_ ARG_TO_INT ARG_TO_PTR
which are no longer being used anywhere. we dont really need the
custom std.h header. remove it from the repo. where we need types,
introduce standard types.h

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 drivers/staging/tidspbridge/core/chnl_sm.c         |    3 +-
 drivers/staging/tidspbridge/core/dsp-clock.c       |    3 +-
 drivers/staging/tidspbridge/core/io_sm.c           |    2 +-
 drivers/staging/tidspbridge/core/msg_sm.c          |    2 +-
 drivers/staging/tidspbridge/core/tiomap3430.c      |    2 +-
 drivers/staging/tidspbridge/core/wdt.c             |    2 +-
 drivers/staging/tidspbridge/gen/gb.c               |    2 +-
 drivers/staging/tidspbridge/gen/gh.c               |    2 +-
 drivers/staging/tidspbridge/gen/gs.c               |    2 +-
 drivers/staging/tidspbridge/gen/uuidutil.c         |    2 +-
 .../staging/tidspbridge/include/dspbridge/dbdefs.h |    1 -
 .../tidspbridge/include/dspbridge/rmstypes.h       |    4 -
 .../staging/tidspbridge/include/dspbridge/std.h    |   90 --------------------
 drivers/staging/tidspbridge/pmgr/chnl.c            |    2 +-
 drivers/staging/tidspbridge/pmgr/cmm.c             |    2 +-
 drivers/staging/tidspbridge/pmgr/cod.c             |    3 +-
 drivers/staging/tidspbridge/pmgr/dbll.c            |    2 +-
 drivers/staging/tidspbridge/pmgr/dev.c             |    2 +-
 drivers/staging/tidspbridge/pmgr/dmm.c             |    2 +-
 drivers/staging/tidspbridge/pmgr/dspapi.c          |    2 +-
 drivers/staging/tidspbridge/pmgr/io.c              |    2 +-
 drivers/staging/tidspbridge/pmgr/msg.c             |    2 +-
 drivers/staging/tidspbridge/rmgr/dbdcd.c           |    2 +-
 drivers/staging/tidspbridge/rmgr/disp.c            |    2 +-
 drivers/staging/tidspbridge/rmgr/drv.c             |    2 +-
 drivers/staging/tidspbridge/rmgr/drv_interface.c   |    2 +-
 drivers/staging/tidspbridge/rmgr/dspdrv.c          |    2 +-
 drivers/staging/tidspbridge/rmgr/mgr.c             |    3 +-
 drivers/staging/tidspbridge/rmgr/nldr.c            |    3 +-
 drivers/staging/tidspbridge/rmgr/node.c            |    2 +-
 drivers/staging/tidspbridge/rmgr/proc.c            |    2 +-
 drivers/staging/tidspbridge/rmgr/rmm.c             |    3 +-
 drivers/staging/tidspbridge/rmgr/strm.c            |    3 +-
 drivers/staging/tidspbridge/services/cfg.c         |    3 +-
 drivers/staging/tidspbridge/services/services.c    |    3 +-
 35 files changed, 41 insertions(+), 127 deletions(-)
 delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/std.h

diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c
index 714b6f7..b669bc0 100644
--- a/drivers/staging/tidspbridge/core/chnl_sm.c
+++ b/drivers/staging/tidspbridge/core/chnl_sm.c
@@ -42,11 +42,12 @@
  *          !LST_Empty(pchnl->pio_completions) ==> pchnl->sync_event is set.
  */
 
+#include <linux/types.h>
+
 /*  ----------------------------------- OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c
index abaa595..6f9ea05 100644
--- a/drivers/staging/tidspbridge/core/dsp-clock.c
+++ b/drivers/staging/tidspbridge/core/dsp-clock.c
@@ -16,13 +16,14 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
+
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 #include <plat/dmtimer.h>
 #include <plat/mcbsp.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 #include <dspbridge/cfg.h>
 #include <dspbridge/drv.h>
diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c
index 1503968..280b22d 100644
--- a/drivers/staging/tidspbridge/core/io_sm.c
+++ b/drivers/staging/tidspbridge/core/io_sm.c
@@ -23,13 +23,13 @@
  * which may cause timeouts and/or failure of the sync_wait_on_event
  * function.
  */
+#include <linux/types.h>
 
 /* Host OS */
 #include <dspbridge/host_os.h>
 #include <linux/workqueue.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /* Trace & Debug */
diff --git a/drivers/staging/tidspbridge/core/msg_sm.c b/drivers/staging/tidspbridge/core/msg_sm.c
index 7c6d6cc..7b7a4be 100644
--- a/drivers/staging/tidspbridge/core/msg_sm.c
+++ b/drivers/staging/tidspbridge/core/msg_sm.c
@@ -15,9 +15,9 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 25c1271..d067de9 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -16,6 +16,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 #include <linux/mm.h>
@@ -23,7 +24,6 @@
 #include <plat/control.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/core/wdt.c b/drivers/staging/tidspbridge/core/wdt.c
index dd1afe7..2126f59 100644
--- a/drivers/staging/tidspbridge/core/wdt.c
+++ b/drivers/staging/tidspbridge/core/wdt.c
@@ -15,8 +15,8 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 #include <dspbridge/dspdeh.h>
 #include <dspbridge/dev.h>
diff --git a/drivers/staging/tidspbridge/gen/gb.c b/drivers/staging/tidspbridge/gen/gb.c
index d007233..06eb3d3 100644
--- a/drivers/staging/tidspbridge/gen/gb.c
+++ b/drivers/staging/tidspbridge/gen/gb.c
@@ -15,9 +15,9 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <linux/types.h>
 /*  ----------------------------------- This */
 #include <dspbridge/gs.h>
diff --git a/drivers/staging/tidspbridge/gen/gh.c b/drivers/staging/tidspbridge/gen/gh.c
index 44fad88..f72d943 100644
--- a/drivers/staging/tidspbridge/gen/gh.c
+++ b/drivers/staging/tidspbridge/gen/gh.c
@@ -14,7 +14,7 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <dspbridge/std.h>
+#include <linux/types.h>
 
 #include <dspbridge/host_os.h>
 
diff --git a/drivers/staging/tidspbridge/gen/gs.c b/drivers/staging/tidspbridge/gen/gs.c
index 3d091b9..9fc6144 100644
--- a/drivers/staging/tidspbridge/gen/gs.c
+++ b/drivers/staging/tidspbridge/gen/gs.c
@@ -16,8 +16,8 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 #include <linux/types.h>
 
diff --git a/drivers/staging/tidspbridge/gen/uuidutil.c b/drivers/staging/tidspbridge/gen/uuidutil.c
index 070761b..e2c005d 100644
--- a/drivers/staging/tidspbridge/gen/uuidutil.c
+++ b/drivers/staging/tidspbridge/gen/uuidutil.c
@@ -15,12 +15,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
index 9462a96..b408cad 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
@@ -22,7 +22,6 @@
 #include <linux/types.h>
 
 #include <dspbridge/dbtype.h>	/* GPP side type definitions */
-#include <dspbridge/std.h>	/* DSP/BIOS type definitions */
 #include <dspbridge/rms_sh.h>	/* Types shared between GPP and DSP */
 
 #define PG_SIZE4K 4096
diff --git a/drivers/staging/tidspbridge/include/dspbridge/rmstypes.h b/drivers/staging/tidspbridge/include/dspbridge/rmstypes.h
index 3c31f5e..83c0f1d 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/rmstypes.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/rmstypes.h
@@ -19,10 +19,6 @@
 #ifndef RMSTYPES_
 #define RMSTYPES_
 #include <linux/types.h>
-/*
- *  DSP-side definitions.
- */
-#include <dspbridge/std.h>
 typedef u32 rms_word;
 
 #endif /* RMSTYPES_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/std.h b/drivers/staging/tidspbridge/include/dspbridge/std.h
deleted file mode 100644
index ca2827d..0000000
--- a/drivers/staging/tidspbridge/include/dspbridge/std.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * std.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Copyright (C) 2008 Texas Instruments, Inc.
- *
- * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef STD_
-#define STD_
-
-#include <linux/types.h>
-
-/*
- *  ======== _TI_ ========
- *  _TI_ is defined for all TI targets
- */
-#if defined(_29_) || defined(_30_) || defined(_40_) || defined(_50_) || \
-    defined(_54_) || defined(_55_) || defined(_6x_) || defined(_80_) || \
-    defined(_28_) || defined(_24_)
-#define _TI_	1
-#endif
-
-/*
- *  ======== _FLOAT_ ========
- *  _FLOAT_ is defined for all targets that natively support floating point
- */
-#if defined(_SUN_) || defined(_30_) || defined(_40_) || defined(_67_) || \
-    defined(_80_)
-#define _FLOAT_	1
-#endif
-
-/*
- *  ======== _FIXED_ ========
- *  _FIXED_ is defined for all fixed point target architectures
- */
-#if defined(_29_) || defined(_50_) || defined(_54_) || defined(_55_) || \
-    defined(_62_) || defined(_64_) || defined(_28_)
-#define _FIXED_	1
-#endif
-
-/*
- *  ======== _TARGET_ ========
- *  _TARGET_ is defined for all target architectures (as opposed to
- *  host-side software)
- */
-#if defined(_FIXED_) || defined(_FLOAT_)
-#define _TARGET_ 1
-#endif
-
-/*
- *  8, 16, 32-bit type definitions
- *
- *  Sm*	- 8-bit type
- *  Md* - 16-bit type
- *  Lg* - 32-bit type
- *
- *  *s32 - signed type
- *  *u32 - unsigned type
- *  *Bits - unsigned type (bit-maps)
- */
-
-/*
- *  Aliases for standard C types
- */
-
-typedef s32(*fxn) (void);	/* generic function type */
-
-/*
- * 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
- * size as s32 and Ptr in 55x large model.
- */
-#if defined(_28l_) || defined(_55l_)
-#define ARG_TO_INT(A)	((s32)((long)(A) & 0xffff))
-#define ARG_TO_PTR(A)	((Ptr)(A))
-#else
-#define ARG_TO_INT(A)	((s32)(A))
-#define ARG_TO_PTR(A)	((Ptr)(A))
-#endif
-
-#endif /* STD_ */
diff --git a/drivers/staging/tidspbridge/pmgr/chnl.c b/drivers/staging/tidspbridge/pmgr/chnl.c
index bc969d8..9007bfd 100644
--- a/drivers/staging/tidspbridge/pmgr/chnl.c
+++ b/drivers/staging/tidspbridge/pmgr/chnl.c
@@ -17,11 +17,11 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/pmgr/cmm.c b/drivers/staging/tidspbridge/pmgr/cmm.c
index 711d206..8300f97 100644
--- a/drivers/staging/tidspbridge/pmgr/cmm.c
+++ b/drivers/staging/tidspbridge/pmgr/cmm.c
@@ -29,9 +29,9 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c
index a9b0491..d2c8e69 100644
--- a/drivers/staging/tidspbridge/pmgr/cod.c
+++ b/drivers/staging/tidspbridge/pmgr/cod.c
@@ -20,13 +20,14 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
+
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 #include <linux/fs.h>
 #include <linux/uaccess.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c
index 3a50071..fccf369 100644
--- a/drivers/staging/tidspbridge/pmgr/dbll.c
+++ b/drivers/staging/tidspbridge/pmgr/dbll.c
@@ -13,12 +13,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index 2c31f31..4509468 100644
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -15,12 +15,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/pmgr/dmm.c b/drivers/staging/tidspbridge/pmgr/dmm.c
index e211ec5..11bd2b5 100644
--- a/drivers/staging/tidspbridge/pmgr/dmm.c
+++ b/drivers/staging/tidspbridge/pmgr/dmm.c
@@ -20,12 +20,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
index 7597210..8555aad 100644
--- a/drivers/staging/tidspbridge/pmgr/dspapi.c
+++ b/drivers/staging/tidspbridge/pmgr/dspapi.c
@@ -16,12 +16,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/pmgr/io.c b/drivers/staging/tidspbridge/pmgr/io.c
index c6ad203..9f687e0 100644
--- a/drivers/staging/tidspbridge/pmgr/io.c
+++ b/drivers/staging/tidspbridge/pmgr/io.c
@@ -15,12 +15,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/pmgr/msg.c b/drivers/staging/tidspbridge/pmgr/msg.c
index 64f1cb4..7dec2ab 100644
--- a/drivers/staging/tidspbridge/pmgr/msg.c
+++ b/drivers/staging/tidspbridge/pmgr/msg.c
@@ -15,12 +15,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c
index 4fe96bf..169bb15 100644
--- a/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -22,12 +22,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 /*  ----------------------------------- Trace & Debug */
 #include <dspbridge/dbc.h>
diff --git a/drivers/staging/tidspbridge/rmgr/disp.c b/drivers/staging/tidspbridge/rmgr/disp.c
index 7195415..eedf32a 100644
--- a/drivers/staging/tidspbridge/rmgr/disp.c
+++ b/drivers/staging/tidspbridge/rmgr/disp.c
@@ -16,12 +16,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c
index 72e2804..112ac87 100644
--- a/drivers/staging/tidspbridge/rmgr/drv.c
+++ b/drivers/staging/tidspbridge/rmgr/drv.c
@@ -15,12 +15,12 @@
  * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
+#include <linux/types.h>
 
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/rmgr/drv_interface.c b/drivers/staging/tidspbridge/rmgr/drv_interface.c
index 27db842..6dbac3b 100644
--- a/drivers/staging/tidspbridge/rmgr/drv_interface.c
+++ b/drivers/staging/tidspbridge/rmgr/drv_interface.c
@@ -19,6 +19,7 @@
 /*  ----------------------------------- Host OS */
 
 #include <dspbridge/host_os.h>
+#include <linux/types.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
 
@@ -32,7 +33,6 @@
 #include <linux/cdev.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/rmgr/dspdrv.c b/drivers/staging/tidspbridge/rmgr/dspdrv.c
index 19a7471..2fddbbb 100644
--- a/drivers/staging/tidspbridge/rmgr/dspdrv.c
+++ b/drivers/staging/tidspbridge/rmgr/dspdrv.c
@@ -17,10 +17,10 @@
  */
 
 /*  ----------------------------------- Host OS */
+#include <linux/types.h>
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/rmgr/mgr.c b/drivers/staging/tidspbridge/rmgr/mgr.c
index b1a68ac..a7bc93b 100644
--- a/drivers/staging/tidspbridge/rmgr/mgr.c
+++ b/drivers/staging/tidspbridge/rmgr/mgr.c
@@ -18,8 +18,9 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
+
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c
index 53fd371..f59a981 100644
--- a/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -16,9 +16,10 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
+
 #include <dspbridge/host_os.h>
 
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 #include <dspbridge/dbc.h>
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 9a46edc..928079e 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -16,11 +16,11 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index d138d11..c912572 100644
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -16,13 +16,13 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
 /* ------------------------------------ Host OS */
 #include <linux/dma-mapping.h>
 #include <linux/scatterlist.h>
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/rmgr/rmm.c b/drivers/staging/tidspbridge/rmgr/rmm.c
index ff33080..042d32b 100644
--- a/drivers/staging/tidspbridge/rmgr/rmm.c
+++ b/drivers/staging/tidspbridge/rmgr/rmm.c
@@ -37,8 +37,9 @@
  *  been allocated, and not yet freed.
  */
 
+#include <linux/types.h>
+
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c
index e537ee8..d31422d 100644
--- a/drivers/staging/tidspbridge/rmgr/strm.c
+++ b/drivers/staging/tidspbridge/rmgr/strm.c
@@ -16,11 +16,12 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
+
 /*  ----------------------------------- Host OS */
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/services/cfg.c b/drivers/staging/tidspbridge/services/cfg.c
index 8ae64f4..699792c 100644
--- a/drivers/staging/tidspbridge/services/cfg.c
+++ b/drivers/staging/tidspbridge/services/cfg.c
@@ -16,8 +16,9 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
+
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
diff --git a/drivers/staging/tidspbridge/services/services.c b/drivers/staging/tidspbridge/services/services.c
index 23be95c..6a7dd6f 100644
--- a/drivers/staging/tidspbridge/services/services.c
+++ b/drivers/staging/tidspbridge/services/services.c
@@ -16,10 +16,11 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+#include <linux/types.h>
+
 #include <dspbridge/host_os.h>
 
 /*  ----------------------------------- DSP/BIOS Bridge */
-#include <dspbridge/std.h>
 #include <dspbridge/dbdefs.h>
 
 /*  ----------------------------------- Trace & Debug */
-- 
1.6.3.3

[PATCH 04/11] staging: tidspbridge: remove custom typedef reg_uword32

[Nishanth Menon]

use readl, writel to get and set the register instead.

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 drivers/staging/tidspbridge/core/tiomap3430.c     |   18 +--
 drivers/staging/tidspbridge/core/tiomap3430_pwr.c |  126 ++++++---------------
 drivers/staging/tidspbridge/core/tiomap_io.c      |    2 +-
 drivers/staging/tidspbridge/rmgr/node.c           |    4 +-
 4 files changed, 44 insertions(+), 106 deletions(-)

diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index d067de9..51e327f 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -555,24 +555,18 @@ static int bridge_brd_start(struct bridge_dev_context *hDevContext,
 		dev_context->mbox->rxq->callback = (int (*)(void *))io_mbox_msg;
 
 /*PM_IVA2GRPSEL_PER = 0xC0;*/
-		temp = (u32) *((reg_uword32 *)
-				((u32) (resources->dw_per_pm_base) + 0xA8));
+		temp = readl(resources->dw_per_pm_base + 0xA8);
 		temp = (temp & 0xFFFFFF30) | 0xC0;
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA8)) =
-		    (u32) temp;
+		writel(temp, resources->dw_per_pm_base + 0xA8);
 
 /*PM_MPUGRPSEL_PER &= 0xFFFFFF3F; */
-		temp = (u32) *((reg_uword32 *)
-				((u32) (resources->dw_per_pm_base) + 0xA4));
+		temp = readl(resources->dw_per_pm_base + 0xA4);
 		temp = (temp & 0xFFFFFF3F);
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA4)) =
-		    (u32) temp;
+		writel(temp, resources->dw_per_pm_base + 0xA4);
 /*CM_SLEEPDEP_PER |= 0x04; */
-		temp = (u32) *((reg_uword32 *)
-				((u32) (resources->dw_per_base) + 0x44));
+		temp = readl(resources->dw_per_base + 0x44);
 		temp = (temp & 0xFFFFFFFB) | 0x04;
-		*((reg_uword32 *) ((u32) (resources->dw_per_base) + 0x44)) =
-		    (u32) temp;
+		writel(temp, resources->dw_per_base + 0x44);
 
 /*CM_CLKSTCTRL_IVA2 = 0x00000003 -To Allow automatic transitions */
 		(*pdata->dsp_cm_write)(OMAP34XX_CLKSTCTRL_ENABLE_AUTO,
diff --git a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
index 2b3ce64..384b833 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
@@ -430,12 +430,8 @@ void dsp_clk_wakeup_event_ctrl(u32 clock_id, bool enable)
 
 	switch (clock_id) {
 	case BPWR_GP_TIMER5:
-		iva2_grpsel = (u32) *((reg_uword32 *)
-				       ((u32) (resources->dw_per_pm_base) +
-					0xA8));
-		mpu_grpsel = (u32) *((reg_uword32 *)
-				      ((u32) (resources->dw_per_pm_base) +
-				       0xA4));
+		iva2_grpsel = readl(resources->dw_per_pm_base + 0xA8);
+		mpu_grpsel = readl(resources->dw_per_pm_base + 0xA4);
 		if (enable) {
 			iva2_grpsel |= OMAP3430_GRPSEL_GPT5_MASK;
 			mpu_grpsel &= ~OMAP3430_GRPSEL_GPT5_MASK;
@@ -443,18 +439,12 @@ void dsp_clk_wakeup_event_ctrl(u32 clock_id, bool enable)
 			mpu_grpsel |= OMAP3430_GRPSEL_GPT5_MASK;
 			iva2_grpsel &= ~OMAP3430_GRPSEL_GPT5_MASK;
 		}
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA8))
-		    = iva2_grpsel;
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA4))
-		    = mpu_grpsel;
+		writel(iva2_grpsel, resources->dw_per_pm_base + 0xA8);
+		writel(mpu_grpsel, resources->dw_per_pm_base + 0xA4);
 		break;
 	case BPWR_GP_TIMER6:
-		iva2_grpsel = (u32) *((reg_uword32 *)
-				       ((u32) (resources->dw_per_pm_base) +
-					0xA8));
-		mpu_grpsel = (u32) *((reg_uword32 *)
-				      ((u32) (resources->dw_per_pm_base) +
-				       0xA4));
+		iva2_grpsel = readl(resources->dw_per_pm_base + 0xA8);
+		mpu_grpsel = readl(resources->dw_per_pm_base + 0xA4);
 		if (enable) {
 			iva2_grpsel |= OMAP3430_GRPSEL_GPT6_MASK;
 			mpu_grpsel &= ~OMAP3430_GRPSEL_GPT6_MASK;
@@ -462,18 +452,12 @@ void dsp_clk_wakeup_event_ctrl(u32 clock_id, bool enable)
 			mpu_grpsel |= OMAP3430_GRPSEL_GPT6_MASK;
 			iva2_grpsel &= ~OMAP3430_GRPSEL_GPT6_MASK;
 		}
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA8))
-		    = iva2_grpsel;
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA4))
-		    = mpu_grpsel;
+		writel(iva2_grpsel, resources->dw_per_pm_base + 0xA8);
+		writel(mpu_grpsel, resources->dw_per_pm_base + 0xA4);
 		break;
 	case BPWR_GP_TIMER7:
-		iva2_grpsel = (u32) *((reg_uword32 *)
-				       ((u32) (resources->dw_per_pm_base) +
-					0xA8));
-		mpu_grpsel = (u32) *((reg_uword32 *)
-				      ((u32) (resources->dw_per_pm_base) +
-				       0xA4));
+		iva2_grpsel = readl(resources->dw_per_pm_base + 0xA8);
+		mpu_grpsel = readl(resources->dw_per_pm_base + 0xA4);
 		if (enable) {
 			iva2_grpsel |= OMAP3430_GRPSEL_GPT7_MASK;
 			mpu_grpsel &= ~OMAP3430_GRPSEL_GPT7_MASK;
@@ -481,18 +465,12 @@ void dsp_clk_wakeup_event_ctrl(u32 clock_id, bool enable)
 			mpu_grpsel |= OMAP3430_GRPSEL_GPT7_MASK;
 			iva2_grpsel &= ~OMAP3430_GRPSEL_GPT7_MASK;
 		}
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA8))
-		    = iva2_grpsel;
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA4))
-		    = mpu_grpsel;
+		writel(iva2_grpsel, resources->dw_per_pm_base + 0xA8);
+		writel(mpu_grpsel, resources->dw_per_pm_base + 0xA4);
 		break;
 	case BPWR_GP_TIMER8:
-		iva2_grpsel = (u32) *((reg_uword32 *)
-				       ((u32) (resources->dw_per_pm_base) +
-					0xA8));
-		mpu_grpsel = (u32) *((reg_uword32 *)
-				      ((u32) (resources->dw_per_pm_base) +
-				       0xA4));
+		iva2_grpsel = readl(resources->dw_per_pm_base + 0xA8);
+		mpu_grpsel = readl(resources->dw_per_pm_base + 0xA4);
 		if (enable) {
 			iva2_grpsel |= OMAP3430_GRPSEL_GPT8_MASK;
 			mpu_grpsel &= ~OMAP3430_GRPSEL_GPT8_MASK;
@@ -500,18 +478,12 @@ void dsp_clk_wakeup_event_ctrl(u32 clock_id, bool enable)
 			mpu_grpsel |= OMAP3430_GRPSEL_GPT8_MASK;
 			iva2_grpsel &= ~OMAP3430_GRPSEL_GPT8_MASK;
 		}
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA8))
-		    = iva2_grpsel;
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA4))
-		    = mpu_grpsel;
+		writel(iva2_grpsel, resources->dw_per_pm_base + 0xA8);
+		writel(mpu_grpsel, resources->dw_per_pm_base + 0xA4);
 		break;
 	case BPWR_MCBSP1:
-		iva2_grpsel = (u32) *((reg_uword32 *)
-				       ((u32) (resources->dw_core_pm_base) +
-					0xA8));
-		mpu_grpsel = (u32) *((reg_uword32 *)
-				      ((u32) (resources->dw_core_pm_base) +
-				       0xA4));
+		iva2_grpsel = readl(resources->dw_core_pm_base + 0xA8);
+		mpu_grpsel = readl(resources->dw_core_pm_base + 0xA4);
 		if (enable) {
 			iva2_grpsel |= OMAP3430_GRPSEL_MCBSP1_MASK;
 			mpu_grpsel &= ~OMAP3430_GRPSEL_MCBSP1_MASK;
@@ -519,18 +491,12 @@ void dsp_clk_wakeup_event_ctrl(u32 clock_id, bool enable)
 			mpu_grpsel |= OMAP3430_GRPSEL_MCBSP1_MASK;
 			iva2_grpsel &= ~OMAP3430_GRPSEL_MCBSP1_MASK;
 		}
-		*((reg_uword32 *) ((u32) (resources->dw_core_pm_base) + 0xA8))
-		    = iva2_grpsel;
-		*((reg_uword32 *) ((u32) (resources->dw_core_pm_base) + 0xA4))
-		    = mpu_grpsel;
+		writel(iva2_grpsel, resources->dw_core_pm_base + 0xA8);
+		writel(mpu_grpsel, resources->dw_core_pm_base + 0xA4);
 		break;
 	case BPWR_MCBSP2:
-		iva2_grpsel = (u32) *((reg_uword32 *)
-				       ((u32) (resources->dw_per_pm_base) +
-					0xA8));
-		mpu_grpsel = (u32) *((reg_uword32 *)
-				      ((u32) (resources->dw_per_pm_base) +
-				       0xA4));
+		iva2_grpsel = readl(resources->dw_per_pm_base + 0xA8);
+		mpu_grpsel = readl(resources->dw_per_pm_base + 0xA4);
 		if (enable) {
 			iva2_grpsel |= OMAP3430_GRPSEL_MCBSP2_MASK;
 			mpu_grpsel &= ~OMAP3430_GRPSEL_MCBSP2_MASK;
@@ -538,18 +504,12 @@ void dsp_clk_wakeup_event_ctrl(u32 clock_id, bool enable)
 			mpu_grpsel |= OMAP3430_GRPSEL_MCBSP2_MASK;
 			iva2_grpsel &= ~OMAP3430_GRPSEL_MCBSP2_MASK;
 		}
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA8))
-		    = iva2_grpsel;
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA4))
-		    = mpu_grpsel;
+		writel(iva2_grpsel, resources->dw_per_pm_base + 0xA8);
+		writel(mpu_grpsel, resources->dw_per_pm_base + 0xA4);
 		break;
 	case BPWR_MCBSP3:
-		iva2_grpsel = (u32) *((reg_uword32 *)
-				       ((u32) (resources->dw_per_pm_base) +
-					0xA8));
-		mpu_grpsel = (u32) *((reg_uword32 *)
-				      ((u32) (resources->dw_per_pm_base) +
-				       0xA4));
+		iva2_grpsel = readl(resources->dw_per_pm_base + 0xA8);
+		mpu_grpsel = readl(resources->dw_per_pm_base + 0xA4);
 		if (enable) {
 			iva2_grpsel |= OMAP3430_GRPSEL_MCBSP3_MASK;
 			mpu_grpsel &= ~OMAP3430_GRPSEL_MCBSP3_MASK;
@@ -557,18 +517,12 @@ void dsp_clk_wakeup_event_ctrl(u32 clock_id, bool enable)
 			mpu_grpsel |= OMAP3430_GRPSEL_MCBSP3_MASK;
 			iva2_grpsel &= ~OMAP3430_GRPSEL_MCBSP3_MASK;
 		}
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA8))
-		    = iva2_grpsel;
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA4))
-		    = mpu_grpsel;
+		writel(iva2_grpsel, resources->dw_per_pm_base + 0xA8);
+		writel(mpu_grpsel, resources->dw_per_pm_base + 0xA4);
 		break;
 	case BPWR_MCBSP4:
-		iva2_grpsel = (u32) *((reg_uword32 *)
-				       ((u32) (resources->dw_per_pm_base) +
-					0xA8));
-		mpu_grpsel = (u32) *((reg_uword32 *)
-				      ((u32) (resources->dw_per_pm_base) +
-				       0xA4));
+		iva2_grpsel = readl(resources->dw_per_pm_base + 0xA8);
+		mpu_grpsel = readl(resources->dw_per_pm_base + 0xA4);
 		if (enable) {
 			iva2_grpsel |= OMAP3430_GRPSEL_MCBSP4_MASK;
 			mpu_grpsel &= ~OMAP3430_GRPSEL_MCBSP4_MASK;
@@ -576,18 +530,12 @@ void dsp_clk_wakeup_event_ctrl(u32 clock_id, bool enable)
 			mpu_grpsel |= OMAP3430_GRPSEL_MCBSP4_MASK;
 			iva2_grpsel &= ~OMAP3430_GRPSEL_MCBSP4_MASK;
 		}
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA8))
-		    = iva2_grpsel;
-		*((reg_uword32 *) ((u32) (resources->dw_per_pm_base) + 0xA4))
-		    = mpu_grpsel;
+		writel(iva2_grpsel, resources->dw_per_pm_base + 0xA8);
+		writel(mpu_grpsel, resources->dw_per_pm_base + 0xA4);
 		break;
 	case BPWR_MCBSP5:
-		iva2_grpsel = (u32) *((reg_uword32 *)
-				       ((u32) (resources->dw_core_pm_base) +
-					0xA8));
-		mpu_grpsel = (u32) *((reg_uword32 *)
-				      ((u32) (resources->dw_core_pm_base) +
-				       0xA4));
+		iva2_grpsel = readl(resources->dw_per_pm_base + 0xA8);
+		mpu_grpsel = readl(resources->dw_per_pm_base + 0xA4);
 		if (enable) {
 			iva2_grpsel |= OMAP3430_GRPSEL_MCBSP5_MASK;
 			mpu_grpsel &= ~OMAP3430_GRPSEL_MCBSP5_MASK;
@@ -595,10 +543,8 @@ void dsp_clk_wakeup_event_ctrl(u32 clock_id, bool enable)
 			mpu_grpsel |= OMAP3430_GRPSEL_MCBSP5_MASK;
 			iva2_grpsel &= ~OMAP3430_GRPSEL_MCBSP5_MASK;
 		}
-		*((reg_uword32 *) ((u32) (resources->dw_core_pm_base) + 0xA8))
-		    = iva2_grpsel;
-		*((reg_uword32 *) ((u32) (resources->dw_core_pm_base) + 0xA4))
-		    = mpu_grpsel;
+		writel(iva2_grpsel, resources->dw_per_pm_base + 0xA8);
+		writel(mpu_grpsel, resources->dw_per_pm_base + 0xA4);
 		break;
 	}
 }
diff --git a/drivers/staging/tidspbridge/core/tiomap_io.c b/drivers/staging/tidspbridge/core/tiomap_io.c
index c5d39d8..ae165b1 100644
--- a/drivers/staging/tidspbridge/core/tiomap_io.c
+++ b/drivers/staging/tidspbridge/core/tiomap_io.c
@@ -439,7 +439,7 @@ int sm_interrupt_dsp(struct bridge_dev_context *dev_context, u16 mb_val)
 		omap_mbox_restore_ctx(dev_context->mbox);
 
 		/* Access MMU SYS CONFIG register to generate a short wakeup */
-		temp = *(reg_uword32 *) (resources->dw_dmmu_base + 0x10);
+		temp = readl(resources->dw_dmmu_base + 0x10);
 
 		dev_context->dw_brd_state = BRD_RUNNING;
 	} else if (dev_context->dw_brd_state == BRD_RETENTION) {
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 928079e..4cc14fd 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -623,9 +623,7 @@ func_cont:
 			ul_gpp_mem_base = (u32) host_res->dw_mem_base[1];
 			off_set = pul_value - dynext_base;
 			ul_stack_seg_addr = ul_gpp_mem_base + off_set;
-			ul_stack_seg_val = (u32) *((reg_uword32 *)
-						    ((u32)
-						     (ul_stack_seg_addr)));
+			ul_stack_seg_val = readl(ul_stack_seg_addr);
 
 			dev_dbg(bridge, "%s: StackSegVal = 0x%x, StackSegAddr ="
 				" 0x%x\n", __func__, ul_stack_seg_val,
-- 
1.6.3.3

[PATCH 05/11] staging: tidspbridge: remove RET_OK RET_FAIL

[Nishanth Menon]

RET_OK is 0 and RET_FAIL is a -1, replace these custom returns with
a standard errno

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 drivers/staging/tidspbridge/core/tiomap3430.c |   10 ++---
 drivers/staging/tidspbridge/hw/hw_mmu.c       |   53 +++++++++++++------------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 51e327f..33fcef5 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -1506,8 +1506,7 @@ static int bridge_brd_mem_un_map(struct bridge_dev_context *hDevContext,
 				}
 				paddr += HW_PAGE_SIZE4KB;
 			}
-			if (hw_mmu_pte_clear(pte_addr_l2, va_curr, pte_size)
-			    == RET_FAIL) {
+			if (hw_mmu_pte_clear(pte_addr_l2, va_curr, pte_size)) {
 				status = -EPERM;
 				goto EXIT_LOOP;
 			}
@@ -1524,9 +1523,8 @@ static int bridge_brd_mem_un_map(struct bridge_dev_context *hDevContext,
 				/*
 				 * Clear the L1 PTE pointing to the L2 PT
 				 */
-				if (hw_mmu_pte_clear(l1_base_va, va_curr_orig,
-						     HW_MMU_COARSE_PAGE_SIZE) ==
-				    RET_OK)
+				if (!hw_mmu_pte_clear(l1_base_va, va_curr_orig,
+						     HW_MMU_COARSE_PAGE_SIZE))
 					status = 0;
 				else {
 					status = -EPERM;
@@ -1571,7 +1569,7 @@ skip_coarse_page:
 			}
 			paddr += HW_PAGE_SIZE4KB;
 		}
-		if (hw_mmu_pte_clear(l1_base_va, va_curr, pte_size) == RET_OK) {
+		if (!hw_mmu_pte_clear(l1_base_va, va_curr, pte_size)) {
 			status = 0;
 			rem_bytes -= pte_size;
 			va_curr += pte_size;
diff --git a/drivers/staging/tidspbridge/hw/hw_mmu.c b/drivers/staging/tidspbridge/hw/hw_mmu.c
index 4430daf..321b72d 100644
--- a/drivers/staging/tidspbridge/hw/hw_mmu.c
+++ b/drivers/staging/tidspbridge/hw/hw_mmu.c
@@ -22,6 +22,7 @@
 #include <hw_defs.h>
 #include <hw_mmu.h>
 #include <linux/types.h>
+#include <linux/err.h>
 
 #define MMU_BASE_VAL_MASK	0xFC00
 #define MMU_PAGE_MAX	     3
@@ -59,7 +60,7 @@ enum hw_mmu_page_size_t {
  * RETURNS:
  *
  *       Type		: hw_status
- *       Description     : RET_OK		 -- No errors occured
+ *       Description     : 0		 -- No errors occured
  *			 RET_BAD_NULL_PARAM     -- A Pointer
  *						Paramater was set to NULL
  *
@@ -102,7 +103,7 @@ static hw_status mmu_flush_entry(const void __iomem *base_address);
  * RETURNS:
  *
  *       Type	    	: hw_status
- *       Description     : RET_OK		 -- No errors occured
+ *       Description     : 0		 -- No errors occured
  *			 RET_BAD_NULL_PARAM     -- A Pointer Paramater
  *						   was set to NULL
  *			 RET_PARAM_OUT_OF_RANGE -- Input Parameter out
@@ -147,7 +148,7 @@ static hw_status mmu_set_cam_entry(const void __iomem *base_address,
  * RETURNS:
  *
  *       Type	    	: hw_status
- *       Description     : RET_OK		 -- No errors occured
+ *       Description     : 0		 -- No errors occured
  *			 RET_BAD_NULL_PARAM     -- A Pointer Paramater
  *							was set to NULL
  *			 RET_PARAM_OUT_OF_RANGE -- Input Parameter
@@ -167,7 +168,7 @@ static hw_status mmu_set_ram_entry(const void __iomem *base_address,
 
 hw_status hw_mmu_enable(const void __iomem *base_address)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 
 	MMUMMU_CNTLMMU_ENABLE_WRITE32(base_address, HW_SET);
 
@@ -176,7 +177,7 @@ hw_status hw_mmu_enable(const void __iomem *base_address)
 
 hw_status hw_mmu_disable(const void __iomem *base_address)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 
 	MMUMMU_CNTLMMU_ENABLE_WRITE32(base_address, HW_CLEAR);
 
@@ -186,7 +187,7 @@ hw_status hw_mmu_disable(const void __iomem *base_address)
 hw_status hw_mmu_num_locked_set(const void __iomem *base_address,
 				u32 numLockedEntries)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 
 	MMUMMU_LOCK_BASE_VALUE_WRITE32(base_address, numLockedEntries);
 
@@ -196,7 +197,7 @@ hw_status hw_mmu_num_locked_set(const void __iomem *base_address,
 hw_status hw_mmu_victim_num_set(const void __iomem *base_address,
 				u32 victimEntryNum)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 
 	MMUMMU_LOCK_CURRENT_VICTIM_WRITE32(base_address, victimEntryNum);
 
@@ -205,7 +206,7 @@ hw_status hw_mmu_victim_num_set(const void __iomem *base_address,
 
 hw_status hw_mmu_event_ack(const void __iomem *base_address, u32 irqMask)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 
 	MMUMMU_IRQSTATUS_WRITE_REGISTER32(base_address, irqMask);
 
@@ -214,7 +215,7 @@ hw_status hw_mmu_event_ack(const void __iomem *base_address, u32 irqMask)
 
 hw_status hw_mmu_event_disable(const void __iomem *base_address, u32 irqMask)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 	u32 irq_reg;
 
 	irq_reg = MMUMMU_IRQENABLE_READ_REGISTER32(base_address);
@@ -226,7 +227,7 @@ hw_status hw_mmu_event_disable(const void __iomem *base_address, u32 irqMask)
 
 hw_status hw_mmu_event_enable(const void __iomem *base_address, u32 irqMask)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 	u32 irq_reg;
 
 	irq_reg = MMUMMU_IRQENABLE_READ_REGISTER32(base_address);
@@ -238,7 +239,7 @@ hw_status hw_mmu_event_enable(const void __iomem *base_address, u32 irqMask)
 
 hw_status hw_mmu_event_status(const void __iomem *base_address, u32 *irqMask)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 
 	*irqMask = MMUMMU_IRQSTATUS_READ_REGISTER32(base_address);
 
@@ -247,7 +248,7 @@ hw_status hw_mmu_event_status(const void __iomem *base_address, u32 *irqMask)
 
 hw_status hw_mmu_fault_addr_read(const void __iomem *base_address, u32 *addr)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 
 	/*Check the input Parameters */
 	CHECK_INPUT_PARAM(base_address, 0, RET_BAD_NULL_PARAM,
@@ -261,7 +262,7 @@ hw_status hw_mmu_fault_addr_read(const void __iomem *base_address, u32 *addr)
 
 hw_status hw_mmu_ttb_set(const void __iomem *base_address, u32 TTBPhysAddr)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 	u32 load_ttb;
 
 	/*Check the input Parameters */
@@ -277,7 +278,7 @@ hw_status hw_mmu_ttb_set(const void __iomem *base_address, u32 TTBPhysAddr)
 
 hw_status hw_mmu_twl_enable(const void __iomem *base_address)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 
 	MMUMMU_CNTLTWL_ENABLE_WRITE32(base_address, HW_SET);
 
@@ -286,7 +287,7 @@ hw_status hw_mmu_twl_enable(const void __iomem *base_address)
 
 hw_status hw_mmu_twl_disable(const void __iomem *base_address)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 
 	MMUMMU_CNTLTWL_ENABLE_WRITE32(base_address, HW_CLEAR);
 
@@ -296,7 +297,7 @@ hw_status hw_mmu_twl_disable(const void __iomem *base_address)
 hw_status hw_mmu_tlb_flush(const void __iomem *base_address, u32 virtualAddr,
 			   u32 pageSize)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 	u32 virtual_addr_tag;
 	enum hw_mmu_page_size_t pg_size_bits;
 
@@ -318,7 +319,7 @@ hw_status hw_mmu_tlb_flush(const void __iomem *base_address, u32 virtualAddr,
 		break;
 
 	default:
-		return RET_FAIL;
+		return -EINVAL;
 	}
 
 	/* Generate the 20-bit tag from virtual address */
@@ -339,7 +340,7 @@ hw_status hw_mmu_tlb_add(const void __iomem *base_address,
 			 struct hw_mmu_map_attrs_t *map_attrs,
 			 s8 preservedBit, s8 validBit)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 	u32 lock_reg;
 	u32 virtual_addr_tag;
 	enum hw_mmu_page_size_t mmu_pg_size;
@@ -371,7 +372,7 @@ hw_status hw_mmu_tlb_add(const void __iomem *base_address,
 		break;
 
 	default:
-		return RET_FAIL;
+		return -EINVAL;
 	}
 
 	lock_reg = MMUMMU_LOCK_READ_REGISTER32(base_address);
@@ -406,7 +407,7 @@ hw_status hw_mmu_pte_set(const u32 pg_tbl_va,
 			 u32 virtualAddr,
 			 u32 pageSize, struct hw_mmu_map_attrs_t *map_attrs)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 	u32 pte_addr, pte_val;
 	s32 num_entries = 1;
 
@@ -466,7 +467,7 @@ hw_status hw_mmu_pte_set(const u32 pg_tbl_va,
 		break;
 
 	default:
-		return RET_FAIL;
+		return -EINVAL;
 	}
 
 	while (--num_entries >= 0)
@@ -477,7 +478,7 @@ hw_status hw_mmu_pte_set(const u32 pg_tbl_va,
 
 hw_status hw_mmu_pte_clear(const u32 pg_tbl_va, u32 virtualAddr, u32 page_size)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 	u32 pte_addr;
 	s32 num_entries = 1;
 
@@ -510,7 +511,7 @@ hw_status hw_mmu_pte_clear(const u32 pg_tbl_va, u32 virtualAddr, u32 page_size)
 		break;
 
 	default:
-		return RET_FAIL;
+		return -EINVAL;
 	}
 
 	while (--num_entries >= 0)
@@ -522,7 +523,7 @@ hw_status hw_mmu_pte_clear(const u32 pg_tbl_va, u32 virtualAddr, u32 page_size)
 /* mmu_flush_entry */
 static hw_status mmu_flush_entry(const void __iomem *base_address)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 	u32 flush_entry_data = 0x1;
 
 	/*Check the input Parameters */
@@ -542,7 +543,7 @@ static hw_status mmu_set_cam_entry(const void __iomem *base_address,
 				   const u32 validBit,
 				   const u32 virtual_addr_tag)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 	u32 mmu_cam_reg;
 
 	/*Check the input Parameters */
@@ -566,7 +567,7 @@ static hw_status mmu_set_ram_entry(const void __iomem *base_address,
 				   enum hw_element_size_t element_size,
 				   enum hw_mmu_mixed_size_t mixed_size)
 {
-	hw_status status = RET_OK;
+	hw_status status = 0;
 	u32 mmu_ram_reg;
 
 	/*Check the input Parameters */
-- 
1.6.3.3

[PATCH 06/11] staging: tidspbridge: remove GlobalTypes.h

[Nishanth Menon]

Remove custom globaltypes.h header

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 drivers/staging/tidspbridge/hw/GlobalTypes.h |  289 --------------------------
 drivers/staging/tidspbridge/hw/MMURegAcM.h   |    1 -
 drivers/staging/tidspbridge/hw/hw_defs.h     |    2 -
 drivers/staging/tidspbridge/hw/hw_mmu.c      |   32 ---
 4 files changed, 0 insertions(+), 324 deletions(-)
 delete mode 100644 drivers/staging/tidspbridge/hw/GlobalTypes.h

diff --git a/drivers/staging/tidspbridge/hw/GlobalTypes.h b/drivers/staging/tidspbridge/hw/GlobalTypes.h
deleted file mode 100644
index 2f8e69b..0000000
--- a/drivers/staging/tidspbridge/hw/GlobalTypes.h
+++ /dev/null
@@ -1,289 +0,0 @@
-/*
- * GlobalTypes.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * Global HW definitions
- *
- * Copyright (C) 2007 Texas Instruments, Inc.
- *
- * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef _GLOBALTYPES_H
-#define _GLOBALTYPES_H
-
-/*
- * Definition: RET_CODE_BASE
- *
- * DESCRIPTION:  Base value for return code offsets
- */
-#define RET_CODE_BASE	0
-
-/*
- * Definition: *BIT_OFFSET
- *
- * DESCRIPTION:  offset in bytes from start of 32-bit word.
- */
-#define LOWER16BIT_OFFSET	  0
-#define UPPER16BIT_OFFSET	  2
-
-#define LOWER8BIT_OFFSET	   0
-#define LOWER_MIDDLE8BIT_OFFSET    1
-#define UPPER_MIDDLE8BIT_OFFSET    2
-#define UPPER8BIT_OFFSET	   3
-
-#define LOWER8BIT_OF16_OFFSET      0
-#define UPPER8BIT_OF16_OFFSET      1
-
-/*
- * Definition: *BIT_SHIFT
- *
- * DESCRIPTION:  offset in bits from start of 32-bit word.
- */
-#define LOWER16BIT_SHIFT	  0
-#define UPPER16BIT_SHIFT	  16
-
-#define LOWER8BIT_SHIFT	   0
-#define LOWER_MIDDLE8BIT_SHIFT    8
-#define UPPER_MIDDLE8BIT_SHIFT    16
-#define UPPER8BIT_SHIFT	   24
-
-#define LOWER8BIT_OF16_SHIFT      0
-#define UPPER8BIT_OF16_SHIFT      8
-
-/*
- * Definition: LOWER16BIT_MASK
- *
- * DESCRIPTION: 16 bit mask used for inclusion of lower 16 bits i.e. mask out
- *		the upper 16 bits
- */
-#define LOWER16BIT_MASK	0x0000FFFF
-
-/*
- * Definition: LOWER8BIT_MASK
- *
- * DESCRIPTION: 8 bit masks used for inclusion of 8 bits i.e. mask out
- *		the upper 16 bits
- */
-#define LOWER8BIT_MASK	   0x000000FF
-
-/*
- * Definition: RETURN32BITS_FROM16LOWER_AND16UPPER(lower16Bits, upper16Bits)
- *
- * DESCRIPTION: Returns a 32 bit value given a 16 bit lower value and a 16
- *		bit upper value
- */
-#define RETURN32BITS_FROM16LOWER_AND16UPPER(lower16Bits, upper16Bits)\
-    (((((u32)lower16Bits)  & LOWER16BIT_MASK)) | \
-     (((((u32)upper16Bits) & LOWER16BIT_MASK) << UPPER16BIT_SHIFT)))
-
-/*
- * Definition: RETURN16BITS_FROM8LOWER_AND8UPPER(lower16Bits, upper16Bits)
- *
- * DESCRIPTION:  Returns a 16 bit value given a 8 bit lower value and a 8
- *	       bit upper value
- */
-#define RETURN16BITS_FROM8LOWER_AND8UPPER(lower8Bits, upper8Bits)\
-    (((((u32)lower8Bits)  & LOWER8BIT_MASK)) | \
-     (((((u32)upper8Bits) & LOWER8BIT_MASK) << UPPER8BIT_OF16_SHIFT)))
-
-/*
- * Definition: RETURN32BITS_FROM48BIT_VALUES(lower8Bits, lowerMiddle8Bits,
- * 					lowerUpper8Bits, upper8Bits)
- *
- * DESCRIPTION:  Returns a 32 bit value given four 8 bit values
- */
-#define RETURN32BITS_FROM48BIT_VALUES(lower8Bits, lowerMiddle8Bits,\
-	lowerUpper8Bits, upper8Bits)\
-	(((((u32)lower8Bits) & LOWER8BIT_MASK)) | \
-	(((((u32)lowerMiddle8Bits) & LOWER8BIT_MASK) <<\
-		LOWER_MIDDLE8BIT_SHIFT)) | \
-	(((((u32)lowerUpper8Bits) & LOWER8BIT_MASK) <<\
-		UPPER_MIDDLE8BIT_SHIFT)) | \
-	(((((u32)upper8Bits) & LOWER8BIT_MASK) <<\
-		UPPER8BIT_SHIFT)))
-
-/*
- * Definition: READ_LOWER16BITS_OF32(value32bits)
- *
- * DESCRIPTION:  Returns a 16 lower bits of 32bit value
- */
-#define READ_LOWER16BITS_OF32(value32bits)\
-    ((u16)((u32)(value32bits) & LOWER16BIT_MASK))
-
-/*
- * Definition: READ_UPPER16BITS_OF32(value32bits)
- *
- * DESCRIPTION:  Returns a 16 lower bits of 32bit value
- */
-#define READ_UPPER16BITS_OF32(value32bits)\
-	(((u16)((u32)(value32bits) >> UPPER16BIT_SHIFT)) &\
-	LOWER16BIT_MASK)
-
-/*
- * Definition: READ_LOWER8BITS_OF32(value32bits)
- *
- * DESCRIPTION:  Returns a 8 lower bits of 32bit value
- */
-#define READ_LOWER8BITS_OF32(value32bits)\
-    ((u8)((u32)(value32bits) & LOWER8BIT_MASK))
-
-/*
- * Definition: READ_LOWER_MIDDLE8BITS_OF32(value32bits)
- *
- * DESCRIPTION:  Returns a 8 lower middle bits of 32bit value
- */
-#define READ_LOWER_MIDDLE8BITS_OF32(value32bits)\
-	(((u8)((u32)(value32bits) >> LOWER_MIDDLE8BIT_SHIFT)) &\
-	LOWER8BIT_MASK)
-
-/*
- * Definition: READ_LOWER_MIDDLE8BITS_OF32(value32bits)
- *
- * DESCRIPTION:  Returns a 8 lower middle bits of 32bit value
- */
-#define READ_UPPER_MIDDLE8BITS_OF32(value32bits)\
-	(((u8)((u32)(value32bits) >> LOWER_MIDDLE8BIT_SHIFT)) &\
-	LOWER8BIT_MASK)
-
-/*
- * Definition: READ_UPPER8BITS_OF32(value32bits)
- *
- * DESCRIPTION:  Returns a 8 upper bits of 32bit value
- */
-#define READ_UPPER8BITS_OF32(value32bits)\
-    (((u8)((u32)(value32bits) >> UPPER8BIT_SHIFT)) & LOWER8BIT_MASK)
-
-/*
- * Definition: READ_LOWER8BITS_OF16(value16bits)
- *
- * DESCRIPTION:  Returns a 8 lower bits of 16bit value
- */
-#define READ_LOWER8BITS_OF16(value16bits)\
-    ((u8)((u16)(value16bits) & LOWER8BIT_MASK))
-
-/*
- * Definition: READ_UPPER8BITS_OF16(value32bits)
- *
- * DESCRIPTION:  Returns a 8 upper bits of 16bit value
- */
-#define READ_UPPER8BITS_OF16(value16bits)\
-    (((u8)((u32)(value16bits) >> UPPER8BIT_SHIFT)) & LOWER8BIT_MASK)
-
-/* UWORD16:  16 bit tpyes */
-
-/* reg_uword8, reg_word8: 8 bit register types */
-typedef volatile unsigned char reg_uword8;
-typedef volatile signed char reg_word8;
-
-/* reg_uword16, reg_word16: 16 bit register types */
-#ifndef OMAPBRIDGE_TYPES
-typedef volatile unsigned short reg_uword16;
-#endif
-typedef volatile short reg_word16;
-
-/* reg_uword32, REG_WORD32: 32 bit register types */
-typedef volatile unsigned long reg_uword32;
-
-/* FLOAT
- *
- * Type to be used for floating point calculation. Note that floating point
- * calculation is very CPU expensive, and you should only  use if you
- * absolutely need this. */
-
-/* boolean_t:  Boolean Type True, False */
-/* return_code_t:  Return codes to be returned by all library functions */
-enum return_code_label {
-	RET_OK = 0,
-	RET_FAIL = -1,
-	RET_BAD_NULL_PARAM = -2,
-	RET_PARAM_OUT_OF_RANGE = -3,
-	RET_INVALID_ID = -4,
-	RET_EMPTY = -5,
-	RET_FULL = -6,
-	RET_TIMEOUT = -7,
-	RET_INVALID_OPERATION = -8,
-
-	/* Add new error codes at end of above list */
-
-	RET_NUM_RET_CODES	/* this should ALWAYS be LAST entry */
-};
-
-/* MACRO: RD_MEM8, WR_MEM8
- *
- * DESCRIPTION:  32 bit memory access macros
- */
-#define RD_MEM8(addr)	((u8)(*((u8 *)(addr))))
-#define WR_MEM8(addr, data)	(*((u8 *)(addr)) = (u8)(data))
-
-/* MACRO: RD_MEM8_VOLATILE, WR_MEM8_VOLATILE
- *
- * DESCRIPTION:  8 bit register access macros
- */
-#define RD_MEM8_VOLATILE(addr)	((u8)(*((reg_uword8 *)(addr))))
-#define WR_MEM8_VOLATILE(addr, data) (*((reg_uword8 *)(addr)) = (u8)(data))
-
-/*
- * MACRO: RD_MEM16, WR_MEM16
- *
- * DESCRIPTION:  16 bit memory access macros
- */
-#define RD_MEM16(addr)	((u16)(*((u16 *)(addr))))
-#define WR_MEM16(addr, data)	(*((u16 *)(addr)) = (u16)(data))
-
-/*
- * MACRO: RD_MEM16_VOLATILE, WR_MEM16_VOLATILE
- *
- * DESCRIPTION:  16 bit register access macros
- */
-#define RD_MEM16_VOLATILE(addr)	((u16)(*((reg_uword16 *)(addr))))
-#define WR_MEM16_VOLATILE(addr, data)	(*((reg_uword16 *)(addr)) =\
-					(u16)(data))
-
-/*
- * MACRO: RD_MEM32, WR_MEM32
- *
- * DESCRIPTION:  32 bit memory access macros
- */
-#define RD_MEM32(addr)	((u32)(*((u32 *)(addr))))
-#define WR_MEM32(addr, data)	(*((u32 *)(addr)) = (u32)(data))
-
-/*
- * MACRO: RD_MEM32_VOLATILE, WR_MEM32_VOLATILE
- *
- * DESCRIPTION:  32 bit register access macros
- */
-#define RD_MEM32_VOLATILE(addr)	((u32)(*((reg_uword32 *)(addr))))
-#define WR_MEM32_VOLATILE(addr, data)	(*((reg_uword32 *)(addr)) =\
-					(u32)(data))
-
-/* Not sure if this all belongs here */
-
-#define CHECK_RETURN_VALUE(actualValue, expectedValue,  returnCodeIfMismatch,\
-	spyCodeIfMisMatch)
-#define CHECK_RETURN_VALUE_RET(actualValue, expectedValue, returnCodeIfMismatch)
-#define CHECK_RETURN_VALUE_RES(actualValue, expectedValue, spyCodeIfMisMatch)
-#define CHECK_RETURN_VALUE_RET_VOID(actualValue, expectedValue,\
-	spyCodeIfMisMatch)
-
-#define CHECK_INPUT_PARAM(actualValue, invalidValue, returnCodeIfMismatch,\
-	spyCodeIfMisMatch)
-#define CHECK_INPUT_PARAM_NO_SPY(actualValue, invalidValue,\
-	returnCodeIfMismatch)
-#define CHECK_INPUT_RANGE(actualValue, minValidValue, maxValidValue,\
-	returnCodeIfMismatch, spyCodeIfMisMatch)
-#define CHECK_INPUT_RANGE_NO_SPY(actualValue, minValidValue, maxValidValue,\
-	returnCodeIfMismatch)
-#define CHECK_INPUT_RANGE_MIN0(actualValue, maxValidValue,\
-	returnCodeIfMismatch, spyCodeIfMisMatch)
-#define CHECK_INPUT_RANGE_NO_SPY_MIN0(actualValue, maxValidValue,\
-	returnCodeIfMismatch)
-
-#endif /* _GLOBALTYPES_H */
diff --git a/drivers/staging/tidspbridge/hw/MMURegAcM.h b/drivers/staging/tidspbridge/hw/MMURegAcM.h
index c341060..eafd478 100644
--- a/drivers/staging/tidspbridge/hw/MMURegAcM.h
+++ b/drivers/staging/tidspbridge/hw/MMURegAcM.h
@@ -17,7 +17,6 @@
 #ifndef _MMU_REG_ACM_H
 #define _MMU_REG_ACM_H
 
-#include <GlobalTypes.h>
 #include <linux/io.h>
 #include <EasiGlobal.h>
 
diff --git a/drivers/staging/tidspbridge/hw/hw_defs.h b/drivers/staging/tidspbridge/hw/hw_defs.h
index 98f6045..d5266d4 100644
--- a/drivers/staging/tidspbridge/hw/hw_defs.h
+++ b/drivers/staging/tidspbridge/hw/hw_defs.h
@@ -19,8 +19,6 @@
 #ifndef _HW_DEFS_H
 #define _HW_DEFS_H
 
-#include <GlobalTypes.h>
-
 /* Page size */
 #define HW_PAGE_SIZE4KB   0x1000
 #define HW_PAGE_SIZE64KB  0x10000
diff --git a/drivers/staging/tidspbridge/hw/hw_mmu.c b/drivers/staging/tidspbridge/hw/hw_mmu.c
index 321b72d..fdff2e5 100644
--- a/drivers/staging/tidspbridge/hw/hw_mmu.c
+++ b/drivers/staging/tidspbridge/hw/hw_mmu.c
@@ -16,7 +16,6 @@
  * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#include <GlobalTypes.h>
 #include <linux/io.h>
 #include "MMURegAcM.h"
 #include <hw_defs.h>
@@ -250,10 +249,6 @@ hw_status hw_mmu_fault_addr_read(const void __iomem *base_address, u32 *addr)
 {
 	hw_status status = 0;
 
-	/*Check the input Parameters */
-	CHECK_INPUT_PARAM(base_address, 0, RET_BAD_NULL_PARAM,
-			  RES_MMU_BASE + RES_INVALID_INPUT_PARAM);
-
 	/* read values from register */
 	*addr = MMUMMU_FAULT_AD_READ_REGISTER32(base_address);
 
@@ -265,10 +260,6 @@ hw_status hw_mmu_ttb_set(const void __iomem *base_address, u32 TTBPhysAddr)
 	hw_status status = 0;
 	u32 load_ttb;
 
-	/*Check the input Parameters */
-	CHECK_INPUT_PARAM(base_address, 0, RET_BAD_NULL_PARAM,
-			  RES_MMU_BASE + RES_INVALID_INPUT_PARAM);
-
 	load_ttb = TTBPhysAddr & ~0x7FUL;
 	/* write values to register */
 	MMUMMU_TTB_WRITE_REGISTER32(base_address, load_ttb);
@@ -346,14 +337,6 @@ hw_status hw_mmu_tlb_add(const void __iomem *base_address,
 	enum hw_mmu_page_size_t mmu_pg_size;
 
 	/*Check the input Parameters */
-	CHECK_INPUT_PARAM(base_address, 0, RET_BAD_NULL_PARAM,
-			  RES_MMU_BASE + RES_INVALID_INPUT_PARAM);
-	CHECK_INPUT_RANGE_MIN0(pageSize, MMU_PAGE_MAX, RET_PARAM_OUT_OF_RANGE,
-			       RES_MMU_BASE + RES_INVALID_INPUT_PARAM);
-	CHECK_INPUT_RANGE_MIN0(map_attrs->element_size, MMU_ELEMENTSIZE_MAX,
-			       RET_PARAM_OUT_OF_RANGE, RES_MMU_BASE +
-			       RES_INVALID_INPUT_PARAM);
-
 	switch (pageSize) {
 	case HW_PAGE_SIZE4KB:
 		mmu_pg_size = HW_MMU_SMALL_PAGE;
@@ -526,10 +509,6 @@ static hw_status mmu_flush_entry(const void __iomem *base_address)
 	hw_status status = 0;
 	u32 flush_entry_data = 0x1;
 
-	/*Check the input Parameters */
-	CHECK_INPUT_PARAM(base_address, 0, RET_BAD_NULL_PARAM,
-			  RES_MMU_BASE + RES_INVALID_INPUT_PARAM);
-
 	/* write values to register */
 	MMUMMU_FLUSH_ENTRY_WRITE_REGISTER32(base_address, flush_entry_data);
 
@@ -546,10 +525,6 @@ static hw_status mmu_set_cam_entry(const void __iomem *base_address,
 	hw_status status = 0;
 	u32 mmu_cam_reg;
 
-	/*Check the input Parameters */
-	CHECK_INPUT_PARAM(base_address, 0, RET_BAD_NULL_PARAM,
-			  RES_MMU_BASE + RES_INVALID_INPUT_PARAM);
-
 	mmu_cam_reg = (virtual_addr_tag << 12);
 	mmu_cam_reg = (mmu_cam_reg) | (pageSize) | (validBit << 2) |
 	    (preservedBit << 3);
@@ -570,13 +545,6 @@ static hw_status mmu_set_ram_entry(const void __iomem *base_address,
 	hw_status status = 0;
 	u32 mmu_ram_reg;
 
-	/*Check the input Parameters */
-	CHECK_INPUT_PARAM(base_address, 0, RET_BAD_NULL_PARAM,
-			  RES_MMU_BASE + RES_INVALID_INPUT_PARAM);
-	CHECK_INPUT_RANGE_MIN0(element_size, MMU_ELEMENTSIZE_MAX,
-			       RET_PARAM_OUT_OF_RANGE, RES_MMU_BASE +
-			       RES_INVALID_INPUT_PARAM);
-
 	mmu_ram_reg = (physicalAddr & MMU_ADDR_MASK);
 	mmu_ram_reg = (mmu_ram_reg) | ((endianism << 9) | (element_size << 7) |
 				       (mixed_size << 6));
-- 
1.6.3.3

[PATCH 07/11] staging: tidspbridge: replace CONST with c standard const

[Nishanth Menon]

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 drivers/staging/tidspbridge/core/chnl_sm.c         |    4 ++--
 drivers/staging/tidspbridge/core/io_sm.c           |    2 +-
 drivers/staging/tidspbridge/core/msg_sm.c          |    2 +-
 drivers/staging/tidspbridge/core/tiomap3430.c      |    2 +-
 .../staging/tidspbridge/include/dspbridge/chnl.h   |    2 +-
 .../staging/tidspbridge/include/dspbridge/cmm.h    |    2 +-
 .../staging/tidspbridge/include/dspbridge/cod.h    |    2 +-
 .../staging/tidspbridge/include/dspbridge/dev.h    |    8 ++++----
 .../staging/tidspbridge/include/dspbridge/disp.h   |    4 ++--
 .../staging/tidspbridge/include/dspbridge/dmm.h    |    2 +-
 .../tidspbridge/include/dspbridge/dspchnl.h        |    4 ++--
 .../tidspbridge/include/dspbridge/dspdefs.h        |   10 +++++-----
 .../staging/tidspbridge/include/dspbridge/dspio.h  |    2 +-
 .../staging/tidspbridge/include/dspbridge/dspmsg.h |    2 +-
 drivers/staging/tidspbridge/include/dspbridge/io.h |    2 +-
 .../staging/tidspbridge/include/dspbridge/nldr.h   |    4 ++--
 .../tidspbridge/include/dspbridge/nldrdefs.h       |    4 ++--
 .../staging/tidspbridge/include/dspbridge/node.h   |   10 +++++-----
 .../staging/tidspbridge/include/dspbridge/proc.h   |    6 +++---
 .../staging/tidspbridge/include/dspbridge/pwr.h    |    4 ++--
 drivers/staging/tidspbridge/pmgr/chnl.c            |    2 +-
 drivers/staging/tidspbridge/pmgr/cmm.c             |    2 +-
 drivers/staging/tidspbridge/pmgr/cod.c             |    4 ++--
 drivers/staging/tidspbridge/pmgr/dev.c             |    4 ++--
 drivers/staging/tidspbridge/pmgr/dmm.c             |    2 +-
 drivers/staging/tidspbridge/pmgr/dspapi.c          |    2 +-
 drivers/staging/tidspbridge/pmgr/io.c              |    2 +-
 drivers/staging/tidspbridge/rmgr/disp.c            |    4 ++--
 drivers/staging/tidspbridge/rmgr/nldr.c            |    4 ++--
 drivers/staging/tidspbridge/rmgr/node.c            |   14 +++++++-------
 drivers/staging/tidspbridge/rmgr/proc.c            |    8 ++++----
 drivers/staging/tidspbridge/rmgr/pwr.c             |    4 ++--
 32 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c
index b669bc0..25fe1a2 100644
--- a/drivers/staging/tidspbridge/core/chnl_sm.c
+++ b/drivers/staging/tidspbridge/core/chnl_sm.c
@@ -383,7 +383,7 @@ func_cont:
  */
 int bridge_chnl_create(OUT struct chnl_mgr **phChnlMgr,
 			      struct dev_object *hdev_obj,
-			      IN CONST struct chnl_mgrattrs *pMgrAttrs)
+			      IN const struct chnl_mgrattrs *pMgrAttrs)
 {
 	int status = 0;
 	struct chnl_mgr *chnl_mgr_obj = NULL;
@@ -777,7 +777,7 @@ int bridge_chnl_idle(struct chnl_object *chnl_obj, u32 dwTimeOut,
  */
 int bridge_chnl_open(OUT struct chnl_object **phChnl,
 			    struct chnl_mgr *hchnl_mgr, s8 chnl_mode,
-			    u32 uChnlId, CONST IN struct chnl_attr *pattrs)
+			    u32 uChnlId, const IN struct chnl_attr *pattrs)
 {
 	int status = 0;
 	struct chnl_mgr *chnl_mgr_obj = hchnl_mgr;
diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c
index 280b22d..73ba306 100644
--- a/drivers/staging/tidspbridge/core/io_sm.c
+++ b/drivers/staging/tidspbridge/core/io_sm.c
@@ -163,7 +163,7 @@ static int register_shm_segs(struct io_mgr *hio_mgr,
  */
 int bridge_io_create(OUT struct io_mgr **phIOMgr,
 			    struct dev_object *hdev_obj,
-			    IN CONST struct io_attrs *pMgrAttrs)
+			    IN const struct io_attrs *pMgrAttrs)
 {
 	int status = 0;
 	struct io_mgr *pio_mgr = NULL;
diff --git a/drivers/staging/tidspbridge/core/msg_sm.c b/drivers/staging/tidspbridge/core/msg_sm.c
index 7b7a4be..576dac0 100644
--- a/drivers/staging/tidspbridge/core/msg_sm.c
+++ b/drivers/staging/tidspbridge/core/msg_sm.c
@@ -383,7 +383,7 @@ func_end:
  *      Put a message onto a msg_ctrl queue.
  */
 int bridge_msg_put(struct msg_queue *msg_queue_obj,
-			  IN CONST struct dsp_msg *pmsg, u32 utimeout)
+			  IN const struct dsp_msg *pmsg, u32 utimeout)
 {
 	struct msg_frame *msg_frame_obj;
 	struct msg_mgr *hmsg_mgr;
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 33fcef5..0a4b054 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -237,7 +237,7 @@ static void bad_page_dump(u32 pa, struct page *pg)
  *      Bridge Driver entry point.
  */
 void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
-		   IN CONST char *driver_file_name)
+		   IN const char *driver_file_name)
 {
 
 	DBC_REQUIRE(driver_file_name != NULL);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/chnl.h b/drivers/staging/tidspbridge/include/dspbridge/chnl.h
index 89315dc..4e3d99e 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/chnl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/chnl.h
@@ -79,7 +79,7 @@ extern int chnl_close(struct chnl_object *chnl_obj);
  */
 extern int chnl_create(OUT struct chnl_mgr **phChnlMgr,
 			      struct dev_object *hdev_obj,
-			      IN CONST struct chnl_mgrattrs *pMgrAttrs);
+			      IN const struct chnl_mgrattrs *pMgrAttrs);
 
 /*
  *  ======== chnl_destroy ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cmm.h b/drivers/staging/tidspbridge/include/dspbridge/cmm.h
index 493ff56..5b902c1 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cmm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cmm.h
@@ -87,7 +87,7 @@ extern void *cmm_calloc_buf(struct cmm_object *hcmm_mgr,
  */
 extern int cmm_create(OUT struct cmm_object **ph_cmm_mgr,
 			     struct dev_object *hdev_obj,
-			     IN CONST struct cmm_mgrattrs *pMgrAttrs);
+			     IN const struct cmm_mgrattrs *pMgrAttrs);
 
 /*
  *  ======== cmm_destroy ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h
index 6914247..4edc6a1 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cod.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h
@@ -93,7 +93,7 @@ extern void cod_close(struct cod_libraryobj *lib);
  */
 extern int cod_create(OUT struct cod_manager **phManager,
 			     char *pstrZLFile,
-			     IN OPTIONAL CONST struct cod_attrs *attrs);
+			     IN OPTIONAL const struct cod_attrs *attrs);
 
 /*
  *  ======== cod_delete ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h
index 434c128..126adaa 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dev.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h
@@ -91,7 +91,7 @@ extern u32 dev_brd_write_fxn(void *pArb,
  */
 extern int dev_create_device(OUT struct dev_object
 				    **phDevObject,
-				    IN CONST char *driver_file_name,
+				    IN const char *driver_file_name,
 				    struct cfg_devnode *dev_node_obj);
 
 /*
@@ -126,8 +126,8 @@ extern int dev_create_device(OUT struct dev_object
  */
 extern int dev_create_iva_device(OUT struct dev_object
 					**phDevObject,
-					IN CONST char *driver_file_name,
-					IN CONST struct cfg_hostres
+					IN const char *driver_file_name,
+					IN const struct cfg_hostres
 					*pHostConfig,
 					struct cfg_devnode *dev_node_obj);
 
@@ -490,7 +490,7 @@ extern int dev_get_node_manager(struct dev_object
  *      0:        *pul_value contains the symbol value;
  */
 extern int dev_get_symbol(struct dev_object *hdev_obj,
-				 IN CONST char *pstrSym, OUT u32 * pul_value);
+				 IN const char *pstrSym, OUT u32 * pul_value);
 
 /*
  *  ======== dev_get_bridge_context ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/disp.h b/drivers/staging/tidspbridge/include/dspbridge/disp.h
index 2fd14b0..421b260 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/disp.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/disp.h
@@ -50,7 +50,7 @@
  */
 extern int disp_create(OUT struct disp_object **phDispObject,
 			      struct dev_object *hdev_obj,
-			      IN CONST struct disp_attr *pDispAttrs);
+			      IN const struct disp_attr *pDispAttrs);
 
 /*
  *  ======== disp_delete ========
@@ -147,7 +147,7 @@ extern int disp_node_create(struct disp_object *hDispObject,
 				   struct node_object *hnode,
 				   u32 ul_fxn_addr,
 				   u32 ul_create_fxn,
-				   IN CONST struct node_createargs
+				   IN const struct node_createargs
 				   *pargs, OUT nodeenv *pNodeEnv);
 
 /*
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dmm.h b/drivers/staging/tidspbridge/include/dspbridge/dmm.h
index 1ce1b65..1581ebb 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dmm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dmm.h
@@ -59,7 +59,7 @@ extern int dmm_delete_tables(struct dmm_object *dmm_mgr);
 
 extern int dmm_create(OUT struct dmm_object **phDmmMgr,
 			     struct dev_object *hdev_obj,
-			     IN CONST struct dmm_mgrattrs *pMgrAttrs);
+			     IN const struct dmm_mgrattrs *pMgrAttrs);
 
 extern bool dmm_init(void);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h b/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
index 5661bca..0eb0d9d 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
@@ -26,7 +26,7 @@
 
 extern int bridge_chnl_create(OUT struct chnl_mgr **phChnlMgr,
 				     struct dev_object *hdev_obj,
-				     IN CONST struct chnl_mgrattrs
+				     IN const struct chnl_mgrattrs
 				     *pMgrAttrs);
 
 extern int bridge_chnl_destroy(struct chnl_mgr *hchnl_mgr);
@@ -35,7 +35,7 @@ extern int bridge_chnl_open(OUT struct chnl_object **phChnl,
 				   struct chnl_mgr *hchnl_mgr,
 				   s8 chnl_mode,
 				   u32 uChnlId,
-				   CONST IN OPTIONAL struct chnl_attr
+				   const IN OPTIONAL struct chnl_attr
 				   *pattrs);
 
 extern int bridge_chnl_close(struct chnl_object *chnl_obj);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
index 536816b..d92f82c 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
@@ -326,7 +326,7 @@ typedef int(*fxn_chnl_create) (OUT struct chnl_mgr
 				      **phChnlMgr,
 				      struct dev_object
 				      * hdev_obj,
-				      IN CONST struct
+				      IN const struct
 				      chnl_mgrattrs * pMgrAttrs);
 
 /*
@@ -411,7 +411,7 @@ typedef int(*fxn_chnl_open) (OUT struct chnl_object
 				    struct chnl_mgr *hchnl_mgr,
 				    s8 chnl_mode,
 				    u32 uChnlId,
-				    CONST IN OPTIONAL struct
+				    const IN OPTIONAL struct
 				    chnl_attr * pattrs);
 
 /*
@@ -745,7 +745,7 @@ typedef int(*fxn_dev_destroy) (struct bridge_dev_context *hDevContext);
  */
 typedef int(*fxn_io_create) (OUT struct io_mgr **phIOMgr,
 				    struct dev_object *hdev_obj,
-				    IN CONST struct io_attrs *pMgrAttrs);
+				    IN const struct io_attrs *pMgrAttrs);
 
 /*
  *  ======== bridge_io_destroy ========
@@ -915,7 +915,7 @@ typedef int(*fxn_msg_get) (struct msg_queue *msg_queue_obj,
  *  Ensures:
  */
 typedef int(*fxn_msg_put) (struct msg_queue *msg_queue_obj,
-				  IN CONST struct dsp_msg *pmsg, u32 utimeout);
+				  IN const struct dsp_msg *pmsg, u32 utimeout);
 
 /*
  *  ======== bridge_msg_register_notify ========
@@ -1048,6 +1048,6 @@ struct bridge_drv_interface {
  *      Called during the Device_Init phase.
  */
 void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
-		   IN CONST char *driver_file_name);
+		   IN const char *driver_file_name);
 
 #endif /* DSPDEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspio.h b/drivers/staging/tidspbridge/include/dspbridge/dspio.h
index 275697a..563b779 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspio.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspio.h
@@ -28,7 +28,7 @@
 
 extern int bridge_io_create(OUT struct io_mgr **phIOMgr,
 				   struct dev_object *hdev_obj,
-				   IN CONST struct io_attrs *pMgrAttrs);
+				   IN const struct io_attrs *pMgrAttrs);
 
 extern int bridge_io_destroy(struct io_mgr *hio_mgr);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h b/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
index a10634e..d01d756 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
@@ -42,7 +42,7 @@ extern int bridge_msg_get(struct msg_queue *msg_queue_obj,
 				 struct dsp_msg *pmsg, u32 utimeout);
 
 extern int bridge_msg_put(struct msg_queue *msg_queue_obj,
-				 IN CONST struct dsp_msg *pmsg, u32 utimeout);
+				 IN const struct dsp_msg *pmsg, u32 utimeout);
 
 extern int bridge_msg_register_notify(struct msg_queue *msg_queue_obj,
 					  u32 event_mask,
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io.h b/drivers/staging/tidspbridge/include/dspbridge/io.h
index e1610f1..0a25829 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io.h
@@ -51,7 +51,7 @@
  */
 extern int io_create(OUT struct io_mgr **phIOMgr,
 			    struct dev_object *hdev_obj,
-			    IN CONST struct io_attrs *pMgrAttrs);
+			    IN const struct io_attrs *pMgrAttrs);
 
 /*
  *  ======== io_destroy ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/nldr.h b/drivers/staging/tidspbridge/include/dspbridge/nldr.h
index b1dbccd..14bea86 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/nldr.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/nldr.h
@@ -26,14 +26,14 @@
 #define NLDR_
 
 extern int nldr_allocate(struct nldr_object *nldr_obj,
-				void *priv_ref, IN CONST struct dcd_nodeprops
+				void *priv_ref, IN const struct dcd_nodeprops
 				*node_props,
 				OUT struct nldr_nodeobject **phNldrNode,
 				IN bool *pf_phase_split);
 
 extern int nldr_create(OUT struct nldr_object **phNldr,
 			      struct dev_object *hdev_obj,
-			      IN CONST struct nldr_attrs *pattrs);
+			      IN const struct nldr_attrs *pattrs);
 
 extern void nldr_delete(struct nldr_object *nldr_obj);
 extern void nldr_exit(void);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h b/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
index 9be0483..abe44a5 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
@@ -129,7 +129,7 @@ enum nldr_phase {
  */
 typedef int(*nldr_allocatefxn) (struct nldr_object *nldr_obj,
 				       void *priv_ref,
-				       IN CONST struct dcd_nodeprops
+				       IN const struct dcd_nodeprops
 				       * node_props,
 				       OUT struct nldr_nodeobject
 				       **phNldrNode,
@@ -158,7 +158,7 @@ typedef int(*nldr_allocatefxn) (struct nldr_object *nldr_obj,
  */
 typedef int(*nldr_createfxn) (OUT struct nldr_object **phNldr,
 				     struct dev_object *hdev_obj,
-				     IN CONST struct nldr_attrs *pattrs);
+				     IN const struct nldr_attrs *pattrs);
 
 /*
  *  ======== nldr_delete ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/node.h b/drivers/staging/tidspbridge/include/dspbridge/node.h
index e9d8439..4c6c31b 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/node.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/node.h
@@ -56,9 +56,9 @@
  *      error:              *ph_node == NULL.
  */
 extern int node_allocate(struct proc_object *hprocessor,
-				IN CONST struct dsp_uuid *pNodeId,
-				OPTIONAL IN CONST struct dsp_cbdata
-				*pargs, OPTIONAL IN CONST struct dsp_nodeattrin
+				IN const struct dsp_uuid *pNodeId,
+				OPTIONAL IN const struct dsp_cbdata
+				*pargs, OPTIONAL IN const struct dsp_nodeattrin
 				*attr_in,
 				OUT struct node_object **ph_node,
 				struct process_context *pr_ctxt);
@@ -470,7 +470,7 @@ extern int node_pause(struct node_object *hnode);
  *  Ensures:
  */
 extern int node_put_message(struct node_object *hnode,
-				   IN CONST struct dsp_msg *pmsg, u32 utimeout);
+				   IN const struct dsp_msg *pmsg, u32 utimeout);
 
 /*
  *  ======== node_register_notify ========
@@ -554,7 +554,7 @@ extern int node_terminate(struct node_object *hnode,
  *
  */
 extern int node_get_uuid_props(void *hprocessor,
-				      IN CONST struct dsp_uuid *pNodeId,
+				      IN const struct dsp_uuid *pNodeId,
 				      OUT struct dsp_ndbprops
 				      *node_props);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/proc.h b/drivers/staging/tidspbridge/include/dspbridge/proc.h
index 230828c..9ad0934 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/proc.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/proc.h
@@ -52,7 +52,7 @@ extern char *iva_img;
  *      When attr_in is NULL, the default timeout value is 10 seconds.
  */
 extern int proc_attach(u32 processor_id,
-			      OPTIONAL CONST struct dsp_processorattrin
+			      OPTIONAL const struct dsp_processorattrin
 			      *attr_in, void **ph_processor,
 			      struct process_context *pr_ctxt);
 
@@ -329,8 +329,8 @@ extern int proc_get_trace(void *hprocessor, u8 * pbuf, u32 max_size);
  *      can load the processor.
  */
 extern int proc_load(void *hprocessor,
-			    IN CONST s32 argc_index, IN CONST char **user_args,
-			    IN CONST char **user_envp);
+			    IN const s32 argc_index, IN const char **user_args,
+			    IN const char **user_envp);
 
 /*
  *  ======== proc_register_notify ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/pwr.h b/drivers/staging/tidspbridge/include/dspbridge/pwr.h
index 63ccf8c..5fc85ea 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/pwr.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/pwr.h
@@ -45,7 +45,7 @@
  *      -EPERM:          General failure, unable to send sleep command to
  *                          the DSP.
  */
-extern int pwr_sleep_dsp(IN CONST u32 sleepCode, IN CONST u32 timeout);
+extern int pwr_sleep_dsp(IN const u32 sleepCode, IN const u32 timeout);
 
 /*
  *  ======== pwr_wake_dsp ========
@@ -66,7 +66,7 @@ extern int pwr_sleep_dsp(IN CONST u32 sleepCode, IN CONST u32 timeout);
  *      -EPERM:          General failure, unable to send wake command to
  *                          the DSP.
  */
-extern int pwr_wake_dsp(IN CONST u32 timeout);
+extern int pwr_wake_dsp(IN const u32 timeout);
 
 /*
  *  ======== pwr_pm_pre_scale ========
diff --git a/drivers/staging/tidspbridge/pmgr/chnl.c b/drivers/staging/tidspbridge/pmgr/chnl.c
index 9007bfd..d2c089c 100644
--- a/drivers/staging/tidspbridge/pmgr/chnl.c
+++ b/drivers/staging/tidspbridge/pmgr/chnl.c
@@ -53,7 +53,7 @@ static u32 refs;
  */
 int chnl_create(OUT struct chnl_mgr **phChnlMgr,
 		       struct dev_object *hdev_obj,
-		       IN CONST struct chnl_mgrattrs *pMgrAttrs)
+		       IN const struct chnl_mgrattrs *pMgrAttrs)
 {
 	int status;
 	struct chnl_mgr *hchnl_mgr;
diff --git a/drivers/staging/tidspbridge/pmgr/cmm.c b/drivers/staging/tidspbridge/pmgr/cmm.c
index 8300f97..160aa36 100644
--- a/drivers/staging/tidspbridge/pmgr/cmm.c
+++ b/drivers/staging/tidspbridge/pmgr/cmm.c
@@ -242,7 +242,7 @@ void *cmm_calloc_buf(struct cmm_object *hcmm_mgr, u32 usize,
  */
 int cmm_create(OUT struct cmm_object **ph_cmm_mgr,
 		      struct dev_object *hdev_obj,
-		      IN CONST struct cmm_mgrattrs *pMgrAttrs)
+		      IN const struct cmm_mgrattrs *pMgrAttrs)
 {
 	struct cmm_object *cmm_obj = NULL;
 	int status = 0;
diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c
index d2c8e69..61bdaa9 100644
--- a/drivers/staging/tidspbridge/pmgr/cod.c
+++ b/drivers/staging/tidspbridge/pmgr/cod.c
@@ -110,7 +110,7 @@ static s32 cod_f_close(struct file *filp)
 	return 0;
 }
 
-static struct file *cod_f_open(CONST char *psz_file_name, CONST char *pszMode)
+static struct file *cod_f_open(const char *psz_file_name, const char *pszMode)
 {
 	mm_segment_t fs;
 	struct file *filp;
@@ -217,7 +217,7 @@ void cod_close(struct cod_libraryobj *lib)
  *
  */
 int cod_create(OUT struct cod_manager **phMgr, char *pstrDummyFile,
-		      IN OPTIONAL CONST struct cod_attrs *attrs)
+		      IN OPTIONAL const struct cod_attrs *attrs)
 {
 	struct cod_manager *mgr_new;
 	struct dbll_attrs zl_attrs;
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index 4509468..d95167d 100644
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -132,7 +132,7 @@ u32 dev_brd_write_fxn(void *pArb, u32 ulDspAddr, void *pHostBuf,
  *      PM board (device).
  */
 int dev_create_device(OUT struct dev_object **phDevObject,
-			     IN CONST char *driver_file_name,
+			     IN const char *driver_file_name,
 			     struct cfg_devnode *dev_node_obj)
 {
 	struct cfg_hostres *host_res;
@@ -691,7 +691,7 @@ int dev_get_node_manager(struct dev_object *hdev_obj,
  *  ======== dev_get_symbol ========
  */
 int dev_get_symbol(struct dev_object *hdev_obj,
-			  IN CONST char *pstrSym, OUT u32 * pul_value)
+			  IN const char *pstrSym, OUT u32 * pul_value)
 {
 	int status = 0;
 	struct cod_manager *cod_mgr;
diff --git a/drivers/staging/tidspbridge/pmgr/dmm.c b/drivers/staging/tidspbridge/pmgr/dmm.c
index 11bd2b5..23c932c 100644
--- a/drivers/staging/tidspbridge/pmgr/dmm.c
+++ b/drivers/staging/tidspbridge/pmgr/dmm.c
@@ -119,7 +119,7 @@ int dmm_create_tables(struct dmm_object *dmm_mgr, u32 addr, u32 size)
  */
 int dmm_create(OUT struct dmm_object **phDmmMgr,
 		      struct dev_object *hdev_obj,
-		      IN CONST struct dmm_mgrattrs *pMgrAttrs)
+		      IN const struct dmm_mgrattrs *pMgrAttrs)
 {
 	struct dmm_object *dmm_obj = NULL;
 	int status = 0;
diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
index 8555aad..4667507 100644
--- a/drivers/staging/tidspbridge/pmgr/dspapi.c
+++ b/drivers/staging/tidspbridge/pmgr/dspapi.c
@@ -905,7 +905,7 @@ u32 procwrap_load(union Trapped_Args *args, void *pr_ctxt)
 	if (DSP_SUCCEEDED(status)) {
 		status = proc_load(args->args_proc_load.hprocessor,
 				   args->args_proc_load.argc_index,
-				   (CONST char **)argv, (CONST char **)envp);
+				   (const char **)argv, (const char **)envp);
 	}
 func_cont:
 	if (envp) {
diff --git a/drivers/staging/tidspbridge/pmgr/io.c b/drivers/staging/tidspbridge/pmgr/io.c
index 9f687e0..83171f1 100644
--- a/drivers/staging/tidspbridge/pmgr/io.c
+++ b/drivers/staging/tidspbridge/pmgr/io.c
@@ -47,7 +47,7 @@ static u32 refs;
  *      CHNL and msg_ctrl
  */
 int io_create(OUT struct io_mgr **phIOMgr, struct dev_object *hdev_obj,
-		     IN CONST struct io_attrs *pMgrAttrs)
+		     IN const struct io_attrs *pMgrAttrs)
 {
 	struct bridge_drv_interface *intf_fxns;
 	struct io_mgr *hio_mgr = NULL;
diff --git a/drivers/staging/tidspbridge/rmgr/disp.c b/drivers/staging/tidspbridge/rmgr/disp.c
index eedf32a..a1defff 100644
--- a/drivers/staging/tidspbridge/rmgr/disp.c
+++ b/drivers/staging/tidspbridge/rmgr/disp.c
@@ -89,7 +89,7 @@ static int send_message(struct disp_object *disp_obj, u32 dwTimeout,
  */
 int disp_create(OUT struct disp_object **phDispObject,
 		       struct dev_object *hdev_obj,
-		       IN CONST struct disp_attr *pDispAttrs)
+		       IN const struct disp_attr *pDispAttrs)
 {
 	struct disp_object *disp_obj;
 	struct bridge_drv_interface *intf_fxns;
@@ -251,7 +251,7 @@ int disp_node_change_priority(struct disp_object *disp_obj,
 int disp_node_create(struct disp_object *disp_obj,
 			    struct node_object *hnode, u32 ulRMSFxn,
 			    u32 ul_create_fxn,
-			    IN CONST struct node_createargs *pargs,
+			    IN const struct node_createargs *pargs,
 			    OUT nodeenv *pNodeEnv)
 {
 	struct node_msgargs node_msg_args;
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c
index f59a981..b4f7620 100644
--- a/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -324,7 +324,7 @@ static u32 find_gcf(u32 a, u32 b);
  *  ======== nldr_allocate ========
  */
 int nldr_allocate(struct nldr_object *nldr_obj, void *priv_ref,
-			 IN CONST struct dcd_nodeprops *node_props,
+			 IN const struct dcd_nodeprops *node_props,
 			 OUT struct nldr_nodeobject **phNldrNode,
 			 IN bool *pf_phase_split)
 {
@@ -426,7 +426,7 @@ int nldr_allocate(struct nldr_object *nldr_obj, void *priv_ref,
  */
 int nldr_create(OUT struct nldr_object **phNldr,
 		       struct dev_object *hdev_obj,
-		       IN CONST struct nldr_attrs *pattrs)
+		       IN const struct nldr_attrs *pattrs)
 {
 	struct cod_manager *cod_mgr;	/* COD manager */
 	char *psz_coff_buf = NULL;
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 4cc14fd..e5851bb 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -252,7 +252,7 @@ static int get_fxn_address(struct node_object *hnode, u32 * pulFxnAddr,
 				  u32 uPhase);
 static int get_node_props(struct dcd_manager *hdcd_mgr,
 				 struct node_object *hnode,
-				 CONST struct dsp_uuid *pNodeId,
+				 const struct dsp_uuid *pNodeId,
 				 struct dcd_genericobj *pdcdProps);
 static int get_proc_props(struct node_mgr *hnode_mgr,
 				 struct dev_object *hdev_obj);
@@ -291,9 +291,9 @@ enum node_state node_get_state(void *hnode)
  *      Allocate GPP resources to manage a node on the DSP.
  */
 int node_allocate(struct proc_object *hprocessor,
-			 IN CONST struct dsp_uuid *pNodeId,
-			 OPTIONAL IN CONST struct dsp_cbdata *pargs,
-			 OPTIONAL IN CONST struct dsp_nodeattrin *attr_in,
+			 IN const struct dsp_uuid *pNodeId,
+			 OPTIONAL IN const struct dsp_cbdata *pargs,
+			 OPTIONAL IN const struct dsp_nodeattrin *attr_in,
 			 OUT struct node_object **ph_node,
 			 struct process_context *pr_ctxt)
 {
@@ -2094,7 +2094,7 @@ func_end:
  *      message, or a timeout occurs.
  */
 int node_put_message(struct node_object *hnode,
-			    IN CONST struct dsp_msg *pmsg, u32 utimeout)
+			    IN const struct dsp_msg *pmsg, u32 utimeout)
 {
 	struct node_mgr *hnode_mgr = NULL;
 	enum node_type node_type;
@@ -2888,7 +2888,7 @@ void get_node_info(struct node_object *hnode, struct dsp_nodeinfo *pNodeInfo)
  */
 static int get_node_props(struct dcd_manager *hdcd_mgr,
 				 struct node_object *hnode,
-				 CONST struct dsp_uuid *pNodeId,
+				 const struct dsp_uuid *pNodeId,
 				 struct dcd_genericobj *pdcdProps)
 {
 	u32 len;
@@ -3004,7 +3004,7 @@ static int get_proc_props(struct node_mgr *hnode_mgr,
  *      Fetch Node UUID properties from DCD/DOF file.
  */
 int node_get_uuid_props(void *hprocessor,
-			       IN CONST struct dsp_uuid *pNodeId,
+			       IN const struct dsp_uuid *pNodeId,
 			       OUT struct dsp_ndbprops *node_props)
 {
 	struct node_mgr *hnode_mgr = NULL;
diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index c912572..8ca7852 100644
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -272,7 +272,7 @@ static inline struct page *get_mapping_page(struct dmm_map_object *map_obj,
  */
 int
 proc_attach(u32 processor_id,
-	    OPTIONAL CONST struct dsp_processorattrin *attr_in,
+	    OPTIONAL const struct dsp_processorattrin *attr_in,
 	    void **ph_processor, struct process_context *pr_ctxt)
 {
 	int status = 0;
@@ -469,7 +469,7 @@ int proc_auto_start(struct cfg_devnode *dev_node_obj,
 		argv[0] = sz_exec_file;
 		argv[1] = NULL;
 		/* ...and try to load it: */
-		status = proc_load(p_proc_object, 1, (CONST char **)argv, NULL);
+		status = proc_load(p_proc_object, 1, (const char **)argv, NULL);
 		if (DSP_SUCCEEDED(status))
 			status = proc_start(p_proc_object);
 	}
@@ -1055,8 +1055,8 @@ bool proc_init(void)
  *      This will be an OEM-only function, and not part of the DSP/BIOS Bridge
  *      application developer's API.
  */
-int proc_load(void *hprocessor, IN CONST s32 argc_index,
-		     IN CONST char **user_args, IN CONST char **user_envp)
+int proc_load(void *hprocessor, IN const s32 argc_index,
+		     IN const char **user_args, IN const char **user_envp)
 {
 	int status = 0;
 	struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
diff --git a/drivers/staging/tidspbridge/rmgr/pwr.c b/drivers/staging/tidspbridge/rmgr/pwr.c
index ec6d181..4f5e498 100644
--- a/drivers/staging/tidspbridge/rmgr/pwr.c
+++ b/drivers/staging/tidspbridge/rmgr/pwr.c
@@ -36,7 +36,7 @@
  *  ======== pwr_sleep_dsp ========
  *    Send command to DSP to enter sleep state.
  */
-int pwr_sleep_dsp(IN CONST u32 sleepCode, IN CONST u32 timeout)
+int pwr_sleep_dsp(IN const u32 sleepCode, IN const u32 timeout)
 {
 	struct bridge_drv_interface *intf_fxns;
 	struct bridge_dev_context *dw_context;
@@ -79,7 +79,7 @@ int pwr_sleep_dsp(IN CONST u32 sleepCode, IN CONST u32 timeout)
  *  ======== pwr_wake_dsp ========
  *    Send command to DSP to wake it from sleep.
  */
-int pwr_wake_dsp(IN CONST u32 timeout)
+int pwr_wake_dsp(IN const u32 timeout)
 {
 	struct bridge_drv_interface *intf_fxns;
 	struct bridge_dev_context *dw_context;
-- 
1.6.3.3

[PATCH 08/11] staging: tidspbridge: remove IN modifier

[Nishanth Menon]

IN modifier does not exist. remove it

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 drivers/staging/tidspbridge/core/_tiomap_pwr.h     |   14 ++--
 drivers/staging/tidspbridge/core/chnl_sm.c         |    4 +-
 drivers/staging/tidspbridge/core/dsp-clock.c       |    4 +-
 drivers/staging/tidspbridge/core/io_sm.c           |   20 +++---
 drivers/staging/tidspbridge/core/msg_sm.c          |    2 +-
 drivers/staging/tidspbridge/core/tiomap3430.c      |   18 +++---
 drivers/staging/tidspbridge/core/tiomap3430_pwr.c  |   14 ++--
 drivers/staging/tidspbridge/core/tiomap_io.c       |    4 +-
 drivers/staging/tidspbridge/core/tiomap_io.h       |   10 ++--
 drivers/staging/tidspbridge/dynload/cload.c        |    2 +-
 .../tidspbridge/dynload/tramp_table_c6000.c        |    2 +-
 drivers/staging/tidspbridge/gen/uuidutil.c         |    6 +-
 .../staging/tidspbridge/include/dspbridge/cfg.h    |   18 +++---
 .../staging/tidspbridge/include/dspbridge/chnl.h   |    2 +-
 .../staging/tidspbridge/include/dspbridge/clk.h    |    4 +-
 .../staging/tidspbridge/include/dspbridge/cmm.h    |    4 +-
 .../staging/tidspbridge/include/dspbridge/cod.h    |   14 ++--
 .../staging/tidspbridge/include/dspbridge/dbdcd.h  |   58 +++++++++---------
 .../tidspbridge/include/dspbridge/dbdcddef.h       |    6 +-
 .../staging/tidspbridge/include/dspbridge/dev.h    |   18 +++---
 .../staging/tidspbridge/include/dspbridge/disp.h   |    4 +-
 .../staging/tidspbridge/include/dspbridge/dmm.h    |    2 +-
 .../staging/tidspbridge/include/dspbridge/drv.h    |   14 ++--
 .../tidspbridge/include/dspbridge/dspchnl.h        |    4 +-
 .../tidspbridge/include/dspbridge/dspdefs.h        |   20 +++---
 .../staging/tidspbridge/include/dspbridge/dspio.h  |    4 +-
 .../staging/tidspbridge/include/dspbridge/dspmsg.h |    2 +-
 drivers/staging/tidspbridge/include/dspbridge/io.h |    2 +-
 .../staging/tidspbridge/include/dspbridge/io_sm.h  |    4 +-
 .../staging/tidspbridge/include/dspbridge/mgr.h    |    2 +-
 .../staging/tidspbridge/include/dspbridge/nldr.h   |    6 +-
 .../tidspbridge/include/dspbridge/nldrdefs.h       |    4 +-
 .../staging/tidspbridge/include/dspbridge/node.h   |   16 +++---
 .../staging/tidspbridge/include/dspbridge/proc.h   |    8 +-
 .../staging/tidspbridge/include/dspbridge/pwr.h    |    8 +-
 .../staging/tidspbridge/include/dspbridge/strm.h   |    8 +-
 .../tidspbridge/include/dspbridge/uuidutil.h       |    4 +-
 drivers/staging/tidspbridge/pmgr/chnl.c            |    2 +-
 drivers/staging/tidspbridge/pmgr/cmm.c             |    4 +-
 drivers/staging/tidspbridge/pmgr/cod.c             |   12 ++--
 drivers/staging/tidspbridge/pmgr/dev.c             |    4 +-
 drivers/staging/tidspbridge/pmgr/dmm.c             |    2 +-
 drivers/staging/tidspbridge/pmgr/dspapi.c          |    2 +-
 drivers/staging/tidspbridge/pmgr/io.c              |    2 +-
 drivers/staging/tidspbridge/rmgr/dbdcd.c           |   66 ++++++++++----------
 drivers/staging/tidspbridge/rmgr/disp.c            |    4 +-
 drivers/staging/tidspbridge/rmgr/nldr.c            |   10 ++--
 drivers/staging/tidspbridge/rmgr/node.c            |   18 +++---
 drivers/staging/tidspbridge/rmgr/proc.c            |    8 +-
 drivers/staging/tidspbridge/rmgr/pwr.c             |    8 +-
 drivers/staging/tidspbridge/rmgr/strm.c            |    6 +-
 51 files changed, 242 insertions(+), 242 deletions(-)

diff --git a/drivers/staging/tidspbridge/core/_tiomap_pwr.h b/drivers/staging/tidspbridge/core/_tiomap_pwr.h
index 47c4dd2..bd0354d 100644
--- a/drivers/staging/tidspbridge/core/_tiomap_pwr.h
+++ b/drivers/staging/tidspbridge/core/_tiomap_pwr.h
@@ -30,27 +30,27 @@ extern struct mailbox_context mboxsetting;
  * Wakes up the DSP from DeepSleep
  */
 extern int wake_dsp(struct bridge_dev_context *dev_context,
-							IN void *pargs);
+							void *pargs);
 
 /*
  * ======== sleep_dsp =========
  * Places the DSP in DeepSleep.
  */
 extern int sleep_dsp(struct bridge_dev_context *dev_context,
-			    IN u32 dw_cmd, IN void *pargs);
+			    u32 dw_cmd, void *pargs);
 /*
  *  ========interrupt_dsp========
  *  	  Sends an interrupt to DSP unconditionally.
  */
 extern void interrupt_dsp(struct bridge_dev_context *dev_context,
-							IN u16 mb_val);
+							u16 mb_val);
 
 /*
  * ======== wake_dsp =========
  * Wakes up the DSP from DeepSleep
  */
 extern int dsp_peripheral_clk_ctrl(struct bridge_dev_context
-					*dev_context, IN void *pargs);
+					*dev_context, void *pargs);
 /*
  *  ======== handle_hibernation_from_dsp ========
  *  	Handle Hibernation requested from DSP
@@ -61,19 +61,19 @@ int handle_hibernation_from_dsp(struct bridge_dev_context *dev_context);
  *  	Handle Post Scale notification to DSP
  */
 int post_scale_dsp(struct bridge_dev_context *dev_context,
-							IN void *pargs);
+							void *pargs);
 /*
  *  ======== pre_scale_dsp ========
  *  	Handle Pre Scale notification to DSP
  */
 int pre_scale_dsp(struct bridge_dev_context *dev_context,
-							IN void *pargs);
+							void *pargs);
 /*
  *  ======== handle_constraints_set ========
  *  	Handle constraints request from DSP
  */
 int handle_constraints_set(struct bridge_dev_context *dev_context,
-				  IN void *pargs);
+				  void *pargs);
 
 /*
  *  ======== dsp_clk_wakeup_event_ctrl ========
diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c
index 25fe1a2..25d2450 100644
--- a/drivers/staging/tidspbridge/core/chnl_sm.c
+++ b/drivers/staging/tidspbridge/core/chnl_sm.c
@@ -383,7 +383,7 @@ func_cont:
  */
 int bridge_chnl_create(OUT struct chnl_mgr **phChnlMgr,
 			      struct dev_object *hdev_obj,
-			      IN const struct chnl_mgrattrs *pMgrAttrs)
+			      const struct chnl_mgrattrs *pMgrAttrs)
 {
 	int status = 0;
 	struct chnl_mgr *chnl_mgr_obj = NULL;
@@ -777,7 +777,7 @@ int bridge_chnl_idle(struct chnl_object *chnl_obj, u32 dwTimeOut,
  */
 int bridge_chnl_open(OUT struct chnl_object **phChnl,
 			    struct chnl_mgr *hchnl_mgr, s8 chnl_mode,
-			    u32 uChnlId, const IN struct chnl_attr *pattrs)
+			    u32 uChnlId, const struct chnl_attr *pattrs)
 {
 	int status = 0;
 	struct chnl_mgr *chnl_mgr_obj = hchnl_mgr;
diff --git a/drivers/staging/tidspbridge/core/dsp-clock.c b/drivers/staging/tidspbridge/core/dsp-clock.c
index 6f9ea05..b474e83 100644
--- a/drivers/staging/tidspbridge/core/dsp-clock.c
+++ b/drivers/staging/tidspbridge/core/dsp-clock.c
@@ -239,7 +239,7 @@ void dsp_gpt_wait_overflow(short int clk_id, unsigned int load)
  *      Enable Clock .
  *
  */
-int dsp_clk_enable(IN enum dsp_clk_id clk_id)
+int dsp_clk_enable(enum dsp_clk_id clk_id)
 {
 	int status = 0;
 
@@ -317,7 +317,7 @@ u32 dsp_clock_enable_all(u32 dsp_per_clocks)
  *      Disable the clock.
  *
  */
-int dsp_clk_disable(IN enum dsp_clk_id clk_id)
+int dsp_clk_disable(enum dsp_clk_id clk_id)
 {
 	int status = 0;
 
diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c
index 73ba306..87e59ca 100644
--- a/drivers/staging/tidspbridge/core/io_sm.c
+++ b/drivers/staging/tidspbridge/core/io_sm.c
@@ -132,9 +132,9 @@ struct io_mgr {
 };
 
 /* Function Prototypes */
-static void io_dispatch_chnl(IN struct io_mgr *pio_mgr,
-				IN OUT struct chnl_object *pchnl, u8 iMode);
-static void io_dispatch_msg(IN struct io_mgr *pio_mgr,
+static void io_dispatch_chnl(struct io_mgr *pio_mgr,
+				OUT struct chnl_object *pchnl, u8 iMode);
+static void io_dispatch_msg(struct io_mgr *pio_mgr,
 			    struct msg_mgr *hmsg_mgr);
 static void io_dispatch_pm(struct io_mgr *pio_mgr);
 static void notify_chnl_complete(struct chnl_object *pchnl,
@@ -163,7 +163,7 @@ static int register_shm_segs(struct io_mgr *hio_mgr,
  */
 int bridge_io_create(OUT struct io_mgr **phIOMgr,
 			    struct dev_object *hdev_obj,
-			    IN const struct io_attrs *pMgrAttrs)
+			    const struct io_attrs *pMgrAttrs)
 {
 	int status = 0;
 	struct io_mgr *pio_mgr = NULL;
@@ -838,8 +838,8 @@ func_end:
  *  ======== io_dispatch_chnl ========
  *      Proc-copy chanl dispatch.
  */
-static void io_dispatch_chnl(IN struct io_mgr *pio_mgr,
-				IN OUT struct chnl_object *pchnl, u8 iMode)
+static void io_dispatch_chnl(struct io_mgr *pio_mgr,
+				OUT struct chnl_object *pchnl, u8 iMode)
 {
 	if (!pio_mgr)
 		goto func_end;
@@ -859,7 +859,7 @@ func_end:
  *  ======== io_dispatch_msg ========
  *      Performs I/O dispatch on message queues.
  */
-static void io_dispatch_msg(IN struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr)
+static void io_dispatch_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr)
 {
 	if (!pio_mgr)
 		goto func_end;
@@ -919,7 +919,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
  *      out the dispatch of I/O as a non-preemptible event.It can only be
  *      pre-empted      by an ISR.
  */
-void io_dpc(IN OUT unsigned long pRefData)
+void io_dpc(OUT unsigned long pRefData)
 {
 	struct io_mgr *pio_mgr = (struct io_mgr *)pRefData;
 	struct chnl_mgr *chnl_mgr_obj;
@@ -1720,7 +1720,7 @@ static u32 write_data(struct bridge_dev_context *hDevContext, void *dest,
 }
 
 /* ZCPY IO routines. */
-void io_intr_dsp2(IN struct io_mgr *pio_mgr, IN u16 mb_val)
+void io_intr_dsp2(struct io_mgr *pio_mgr, u16 mb_val)
 {
 	sm_interrupt_dsp(pio_mgr->hbridge_context, mb_val);
 }
@@ -1792,7 +1792,7 @@ int io_sh_msetting(struct io_mgr *hio_mgr, u8 desc, void *pargs)
  *  ======== bridge_io_get_proc_load ========
  *      Gets the Processor's Load information
  */
-int bridge_io_get_proc_load(IN struct io_mgr *hio_mgr,
+int bridge_io_get_proc_load(struct io_mgr *hio_mgr,
 				OUT struct dsp_procloadstat *pProcStat)
 {
 	pProcStat->curr_load = hio_mgr->shared_mem->load_mon_info.curr_dsp_load;
diff --git a/drivers/staging/tidspbridge/core/msg_sm.c b/drivers/staging/tidspbridge/core/msg_sm.c
index 576dac0..7fd85ce 100644
--- a/drivers/staging/tidspbridge/core/msg_sm.c
+++ b/drivers/staging/tidspbridge/core/msg_sm.c
@@ -383,7 +383,7 @@ func_end:
  *      Put a message onto a msg_ctrl queue.
  */
 int bridge_msg_put(struct msg_queue *msg_queue_obj,
-			  IN const struct dsp_msg *pmsg, u32 utimeout)
+			  const struct dsp_msg *pmsg, u32 utimeout)
 {
 	struct msg_frame *msg_frame_obj;
 	struct msg_mgr *hmsg_mgr;
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 0a4b054..3731fd0 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -85,7 +85,7 @@ static int bridge_brd_status(struct bridge_dev_context *dev_context,
 				    int *pdwState);
 static int bridge_brd_stop(struct bridge_dev_context *dev_context);
 static int bridge_brd_write(struct bridge_dev_context *dev_context,
-				   IN u8 *pbHostBuf,
+				   u8 *pbHostBuf,
 				   u32 dwDSPAddr, u32 ul_num_bytes,
 				   u32 ulMemType);
 static int bridge_brd_set_state(struct bridge_dev_context *hDevContext,
@@ -94,7 +94,7 @@ static int bridge_brd_mem_copy(struct bridge_dev_context *hDevContext,
 				   u32 ulDspDestAddr, u32 ulDspSrcAddr,
 				   u32 ul_num_bytes, u32 ulMemType);
 static int bridge_brd_mem_write(struct bridge_dev_context *dev_context,
-				    IN u8 *pbHostBuf, u32 dwDSPAddr,
+				    u8 *pbHostBuf, u32 dwDSPAddr,
 				    u32 ul_num_bytes, u32 ulMemType);
 static int bridge_brd_mem_map(struct bridge_dev_context *hDevContext,
 				  u32 ul_mpu_addr, u32 ulVirtAddr,
@@ -105,9 +105,9 @@ static int bridge_brd_mem_un_map(struct bridge_dev_context *hDevContext,
 static int bridge_dev_create(OUT struct bridge_dev_context
 					**ppDevContext,
 					struct dev_object *hdev_obj,
-					IN struct cfg_hostres *pConfig);
+					struct cfg_hostres *pConfig);
 static int bridge_dev_ctrl(struct bridge_dev_context *dev_context,
-				  u32 dw_cmd, IN OUT void *pargs);
+				  u32 dw_cmd, OUT void *pargs);
 static int bridge_dev_destroy(struct bridge_dev_context *dev_context);
 static u32 user_va2_pa(struct mm_struct *mm, u32 address);
 static int pte_update(struct bridge_dev_context *hDevContext, u32 pa,
@@ -237,7 +237,7 @@ static void bad_page_dump(u32 pa, struct page *pg)
  *      Bridge Driver entry point.
  */
 void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
-		   IN const char *driver_file_name)
+		   const char *driver_file_name)
 {
 
 	DBC_REQUIRE(driver_file_name != NULL);
@@ -759,7 +759,7 @@ static int bridge_brd_status(struct bridge_dev_context *hDevContext,
  *      Copies the buffers to DSP internal or external memory.
  */
 static int bridge_brd_write(struct bridge_dev_context *hDevContext,
-				   IN u8 *pbHostBuf, u32 dwDSPAddr,
+				   u8 *pbHostBuf, u32 dwDSPAddr,
 				   u32 ul_num_bytes, u32 ulMemType)
 {
 	int status = 0;
@@ -788,7 +788,7 @@ static int bridge_brd_write(struct bridge_dev_context *hDevContext,
 static int bridge_dev_create(OUT struct bridge_dev_context
 					**ppDevContext,
 					struct dev_object *hdev_obj,
-					IN struct cfg_hostres *pConfig)
+					struct cfg_hostres *pConfig)
 {
 	int status = 0;
 	struct bridge_dev_context *dev_context = NULL;
@@ -954,7 +954,7 @@ func_end:
  *      Receives device specific commands.
  */
 static int bridge_dev_ctrl(struct bridge_dev_context *dev_context,
-				  u32 dw_cmd, IN OUT void *pargs)
+				  u32 dw_cmd, OUT void *pargs)
 {
 	int status = 0;
 	struct bridge_ioctl_extproc *pa_ext_proc =
@@ -1141,7 +1141,7 @@ static int bridge_brd_mem_copy(struct bridge_dev_context *hDevContext,
 
 /* Mem Write does not halt the DSP to write unlike bridge_brd_write */
 static int bridge_brd_mem_write(struct bridge_dev_context *hDevContext,
-				    IN u8 *pbHostBuf, u32 dwDSPAddr,
+				    u8 *pbHostBuf, u32 dwDSPAddr,
 				    u32 ul_num_bytes, u32 ulMemType)
 {
 	int status = 0;
diff --git a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
index 384b833..dc63b3a 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430_pwr.c
@@ -50,7 +50,7 @@
  *  	Sets new DSP constraint
  */
 int handle_constraints_set(struct bridge_dev_context *dev_context,
-				  IN void *pargs)
+				  void *pargs)
 {
 #ifdef CONFIG_TIDSPBRIDGE_DVFS
 	u32 *constraint_val;
@@ -142,8 +142,8 @@ int handle_hibernation_from_dsp(struct bridge_dev_context *dev_context)
  *  ======== sleep_dsp ========
  *  	Put DSP in low power consuming state.
  */
-int sleep_dsp(struct bridge_dev_context *dev_context, IN u32 dw_cmd,
-		     IN void *pargs)
+int sleep_dsp(struct bridge_dev_context *dev_context, u32 dw_cmd,
+		     void *pargs)
 {
 	int status = 0;
 #ifdef CONFIG_PM
@@ -248,7 +248,7 @@ int sleep_dsp(struct bridge_dev_context *dev_context, IN u32 dw_cmd,
  *  ======== wake_dsp ========
  *  	Wake up DSP from sleep.
  */
-int wake_dsp(struct bridge_dev_context *dev_context, IN void *pargs)
+int wake_dsp(struct bridge_dev_context *dev_context, void *pargs)
 {
 	int status = 0;
 #ifdef CONFIG_PM
@@ -275,7 +275,7 @@ int wake_dsp(struct bridge_dev_context *dev_context, IN void *pargs)
  *  	Enable/Disable the DSP peripheral clocks as needed..
  */
 int dsp_peripheral_clk_ctrl(struct bridge_dev_context *dev_context,
-				   IN void *pargs)
+				   void *pargs)
 {
 	u32 ext_clk = 0;
 	u32 ext_clk_id = 0;
@@ -336,7 +336,7 @@ int dsp_peripheral_clk_ctrl(struct bridge_dev_context *dev_context,
  *  Sends prescale notification to DSP
  *
  */
-int pre_scale_dsp(struct bridge_dev_context *dev_context, IN void *pargs)
+int pre_scale_dsp(struct bridge_dev_context *dev_context, void *pargs)
 {
 #ifdef CONFIG_TIDSPBRIDGE_DVFS
 	u32 level;
@@ -370,7 +370,7 @@ int pre_scale_dsp(struct bridge_dev_context *dev_context, IN void *pargs)
  *
  */
 int post_scale_dsp(struct bridge_dev_context *dev_context,
-							IN void *pargs)
+							void *pargs)
 {
 	int status = 0;
 #ifdef CONFIG_TIDSPBRIDGE_DVFS
diff --git a/drivers/staging/tidspbridge/core/tiomap_io.c b/drivers/staging/tidspbridge/core/tiomap_io.c
index ae165b1..b2d516b 100644
--- a/drivers/staging/tidspbridge/core/tiomap_io.c
+++ b/drivers/staging/tidspbridge/core/tiomap_io.c
@@ -179,7 +179,7 @@ int read_ext_dsp_data(struct bridge_dev_context *hDevContext,
  *      Copies buffers to the DSP internal/external memory.
  */
 int write_dsp_data(struct bridge_dev_context *hDevContext,
-			  IN u8 *pbHostBuf, u32 dwDSPAddr, u32 ul_num_bytes,
+			  u8 *pbHostBuf, u32 dwDSPAddr, u32 ul_num_bytes,
 			  u32 ulMemType)
 {
 	u32 offset;
@@ -225,7 +225,7 @@ int write_dsp_data(struct bridge_dev_context *hDevContext,
  *
  */
 int write_ext_dsp_data(struct bridge_dev_context *dev_context,
-			      IN u8 *pbHostBuf, u32 dwDSPAddr,
+			      u8 *pbHostBuf, u32 dwDSPAddr,
 			      u32 ul_num_bytes, u32 ulMemType,
 			      bool dynamic_load)
 {
diff --git a/drivers/staging/tidspbridge/core/tiomap_io.h b/drivers/staging/tidspbridge/core/tiomap_io.h
index 3bfe7b7..243636d 100644
--- a/drivers/staging/tidspbridge/core/tiomap_io.h
+++ b/drivers/staging/tidspbridge/core/tiomap_io.h
@@ -65,7 +65,7 @@ extern int write_dsp_data(struct bridge_dev_context *dev_context,
  *  shm Memory manager in the CDB
  */
 extern int write_ext_dsp_data(struct bridge_dev_context *dev_context,
-				     IN u8 *pbHostBuf, u32 dwDSPAddr,
+				     u8 *pbHostBuf, u32 dwDSPAddr,
 				     u32 ul_num_bytes, u32 ulMemType,
 				     bool dynamic_load);
 
@@ -73,9 +73,9 @@ extern int write_ext_dsp_data(struct bridge_dev_context *dev_context,
  * ======== write_ext32_bit_dsp_data ========
  * Writes 32 bit data to the external memory
  */
-extern inline void write_ext32_bit_dsp_data(IN const
+extern inline void write_ext32_bit_dsp_data(const
 					struct bridge_dev_context *dev_context,
-					IN u32 dwDSPAddr, IN u32 val)
+					u32 dwDSPAddr, u32 val)
 {
 	*(u32 *) dwDSPAddr = ((dev_context->tc_word_swap_on) ? (((val << 16) &
 								 0xFFFF0000) |
@@ -88,8 +88,8 @@ extern inline void write_ext32_bit_dsp_data(IN const
  * ======== read_ext32_bit_dsp_data ========
  * Reads 32 bit data from the external memory
  */
-extern inline u32 read_ext32_bit_dsp_data(IN const struct bridge_dev_context
-					  *dev_context, IN u32 dwDSPAddr)
+extern inline u32 read_ext32_bit_dsp_data(const struct bridge_dev_context
+					  *dev_context, u32 dwDSPAddr)
 {
 	u32 ret;
 	ret = *(u32 *) dwDSPAddr;
diff --git a/drivers/staging/tidspbridge/dynload/cload.c b/drivers/staging/tidspbridge/dynload/cload.c
index d4f71b5..e48e91b 100644
--- a/drivers/staging/tidspbridge/dynload/cload.c
+++ b/drivers/staging/tidspbridge/dynload/cload.c
@@ -961,7 +961,7 @@ static void cload_cinit(struct dload_state *dlthis,
 	ldr_addr atmp;
 	struct ldr_section_info cinit_info;
 
-	/*  PROCESS ALL THE INITIALIZATION RECORDS IN THE BUFFER. */
+	/*  PROCESS ALL THE INITIALIZATION RECORDS THE BUFFER. */
 	while (true) {
 		left = pktend - pktp;
 		switch (dlthis->cinit_state) {
diff --git a/drivers/staging/tidspbridge/dynload/tramp_table_c6000.c b/drivers/staging/tidspbridge/dynload/tramp_table_c6000.c
index e38d631..47b7492 100644
--- a/drivers/staging/tidspbridge/dynload/tramp_table_c6000.c
+++ b/drivers/staging/tidspbridge/dynload/tramp_table_c6000.c
@@ -26,7 +26,7 @@
 #define C6X_TRAMP_WORD_COUNT			8
 #define C6X_TRAMP_MAX_RELOS			 8
 
-/*  THIS HASH FUNCTION MUST MATCH THE ONE IN reloc_table_c6000.c */
+/*  THIS HASH FUNCTION MUST MATCH THE ONE reloc_table_c6000.c */
 #define HASH_FUNC(zz) (((((zz) + 1) * UINT32_C(1845)) >> 11) & 63)
 
 /*  THIS MUST MATCH reloc_record_t FOR A SYMBOL BASED RELO */
diff --git a/drivers/staging/tidspbridge/gen/uuidutil.c b/drivers/staging/tidspbridge/gen/uuidutil.c
index e2c005d..17434b6 100644
--- a/drivers/staging/tidspbridge/gen/uuidutil.c
+++ b/drivers/staging/tidspbridge/gen/uuidutil.c
@@ -36,8 +36,8 @@
  *      Note: snprintf format specifier is:
  *      %[flags] [width] [.precision] [{h | l | I64 | L}]type
  */
-void uuid_uuid_to_string(IN struct dsp_uuid *uuid_obj, OUT char *pszUuid,
-			 IN s32 size)
+void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, OUT char *pszUuid,
+			 s32 size)
 {
 	s32 i;			/* return result from snprintf. */
 
@@ -75,7 +75,7 @@ static s32 uuid_hex_to_bin(char *buf, s32 len)
  *  Purpose:
  *      Converts a string to a struct dsp_uuid.
  */
-void uuid_uuid_from_string(IN char *pszUuid, OUT struct dsp_uuid *uuid_obj)
+void uuid_uuid_from_string(char *pszUuid, OUT struct dsp_uuid *uuid_obj)
 {
 	s32 j;
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cfg.h b/drivers/staging/tidspbridge/include/dspbridge/cfg.h
index a2580f0..0e7961d 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cfg.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cfg.h
@@ -50,7 +50,7 @@ extern void cfg_exit(void);
  *  Ensures:
  *      0:        *pdwAutoStart contains autostart mask for this devnode.
  */
-extern int cfg_get_auto_start(IN struct cfg_devnode *dev_node_obj,
+extern int cfg_get_auto_start(struct cfg_devnode *dev_node_obj,
 				     OUT u32 *pdwAutoStart);
 
 /*
@@ -90,7 +90,7 @@ extern int cfg_get_cd_version(OUT u32 *pdwVersion);
  *      0:    *pdwValue is set to the retrieved u32.
  *      else:       *pdwValue is set to 0L.
  */
-extern int cfg_get_dev_object(IN struct cfg_devnode *dev_node_obj,
+extern int cfg_get_dev_object(struct cfg_devnode *dev_node_obj,
 				     OUT u32 *pdwValue);
 
 /*
@@ -112,8 +112,8 @@ extern int cfg_get_dev_object(IN struct cfg_devnode *dev_node_obj,
  *                  and *pstrExecFile contains default executable for this
  *                  devnode.
  */
-extern int cfg_get_exec_file(IN struct cfg_devnode *dev_node_obj,
-				    IN u32 buf_size, OUT char *pstrExecFile);
+extern int cfg_get_exec_file(struct cfg_devnode *dev_node_obj,
+				    u32 buf_size, OUT char *pstrExecFile);
 
 /*
  *  ======== cfg_get_object ========
@@ -167,8 +167,8 @@ extern void cfg_get_perf_value(OUT bool *pfEnablePerf);
  *                  pstrZLFileName, and *pstrZLFileName contains ZLFileName
  *                  for this devnode.
  */
-extern int cfg_get_zl_file(IN struct cfg_devnode *dev_node_obj,
-				  IN u32 buf_size, OUT char *pstrZLFileName);
+extern int cfg_get_zl_file(struct cfg_devnode *dev_node_obj,
+				  u32 buf_size, OUT char *pstrZLFileName);
 
 /*
  *  ======== cfg_init ========
@@ -199,8 +199,8 @@ extern bool cfg_init(void);
  *  Ensures:
  *      0:    The Private u32 was successfully set.
  */
-extern int cfg_set_dev_object(IN struct cfg_devnode *dev_node_obj,
-				     IN u32 dwValue);
+extern int cfg_set_dev_object(struct cfg_devnode *dev_node_obj,
+				     u32 dwValue);
 
 /*
  *  ======== CFG_SetDrvObject ========
@@ -217,6 +217,6 @@ extern int cfg_set_dev_object(IN struct cfg_devnode *dev_node_obj,
  *  Ensures:
  *      0:        The Private u32 was successfully set.
  */
-extern int cfg_set_object(IN u32 dwValue, u8 dw_type);
+extern int cfg_set_object(u32 dwValue, u8 dw_type);
 
 #endif /* CFG_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/chnl.h b/drivers/staging/tidspbridge/include/dspbridge/chnl.h
index 4e3d99e..aa6cd77 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/chnl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/chnl.h
@@ -79,7 +79,7 @@ extern int chnl_close(struct chnl_object *chnl_obj);
  */
 extern int chnl_create(OUT struct chnl_mgr **phChnlMgr,
 			      struct dev_object *hdev_obj,
-			      IN const struct chnl_mgrattrs *pMgrAttrs);
+			      const struct chnl_mgrattrs *pMgrAttrs);
 
 /*
  *  ======== chnl_destroy ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/clk.h b/drivers/staging/tidspbridge/include/dspbridge/clk.h
index 61474bc..b239503 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/clk.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/clk.h
@@ -75,7 +75,7 @@ void dsp_gpt_wait_overflow(short int clk_id, unsigned int load);
  *  Requires:
  *  Ensures:
  */
-extern int dsp_clk_enable(IN enum dsp_clk_id clk_id);
+extern int dsp_clk_enable(enum dsp_clk_id clk_id);
 
 u32 dsp_clock_enable_all(u32 dsp_per_clocks);
 
@@ -90,7 +90,7 @@ u32 dsp_clock_enable_all(u32 dsp_per_clocks);
  *  Requires:
  *  Ensures:
  */
-extern int dsp_clk_disable(IN enum dsp_clk_id clk_id);
+extern int dsp_clk_disable(enum dsp_clk_id clk_id);
 
 extern u32 dsp_clk_get_iva2_rate(void);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cmm.h b/drivers/staging/tidspbridge/include/dspbridge/cmm.h
index 5b902c1..70e9dc5 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cmm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cmm.h
@@ -87,7 +87,7 @@ extern void *cmm_calloc_buf(struct cmm_object *hcmm_mgr,
  */
 extern int cmm_create(OUT struct cmm_object **ph_cmm_mgr,
 			     struct dev_object *hdev_obj,
-			     IN const struct cmm_mgrattrs *pMgrAttrs);
+			     const struct cmm_mgrattrs *pMgrAttrs);
 
 /*
  *  ======== cmm_destroy ========
@@ -359,7 +359,7 @@ extern int cmm_xlator_free_buf(struct cmm_xlatorobject *xlator,
  *
  */
 extern int cmm_xlator_info(struct cmm_xlatorobject *xlator,
-				  IN OUT u8 **paddr,
+				  OUT u8 **paddr,
 				  u32 ul_size, u32 uSegId, bool set_info);
 
 /*
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h
index 4edc6a1..cb9b2c3 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cod.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h
@@ -93,7 +93,7 @@ extern void cod_close(struct cod_libraryobj *lib);
  */
 extern int cod_create(OUT struct cod_manager **phManager,
 			     char *pstrZLFile,
-			     IN OPTIONAL const struct cod_attrs *attrs);
+			     OPTIONAL const struct cod_attrs *attrs);
 
 /*
  *  ======== cod_delete ========
@@ -226,7 +226,7 @@ extern int cod_get_loader(struct cod_manager *cod_mgr_obj,
  *
  */
 extern int cod_get_section(struct cod_libraryobj *lib,
-				  IN char *pstrSect,
+				  char *pstrSect,
 				  OUT u32 *puAddr, OUT u32 *puLen);
 
 /*
@@ -251,7 +251,7 @@ extern int cod_get_section(struct cod_libraryobj *lib,
  *  Ensures:
  */
 extern int cod_get_sym_value(struct cod_manager *cod_mgr_obj,
-				    IN char *pstrSym, OUT u32 * pul_value);
+				    char *pstrSym, OUT u32 * pul_value);
 
 /*
  *  ======== cod_init ========
@@ -320,7 +320,7 @@ extern int cod_load_base(struct cod_manager *cod_mgr_obj,
  *  Ensures:
  */
 extern int cod_open(struct cod_manager *hmgr,
-			   IN char *pszCoffPath,
+			   char *pszCoffPath,
 			   u32 flags, OUT struct cod_libraryobj **pLib);
 
 /*
@@ -340,7 +340,7 @@ extern int cod_open(struct cod_manager *hmgr,
  *      pszCoffPath != NULL.
  *  Ensures:
  */
-extern int cod_open_base(struct cod_manager *hmgr, IN char *pszCoffPath,
+extern int cod_open_base(struct cod_manager *hmgr, char *pszCoffPath,
 				dbll_flags flags);
 
 /*
@@ -363,7 +363,7 @@ extern int cod_open_base(struct cod_manager *hmgr, IN char *pszCoffPath,
  *      0:  *pstrContent stores the content of the named section.
  */
 extern int cod_read_section(struct cod_libraryobj *lib,
-				   IN char *pstrSect,
-				   OUT char *pstrContent, IN u32 content_size);
+				   char *pstrSect,
+				   OUT char *pstrContent, u32 content_size);
 
 #endif /* COD_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h b/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
index 54e8238..6d32e02 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
@@ -44,8 +44,8 @@
  *      COFF file to contain the right COFF sections, especially
  *      ".dcd_register", which is used for auto registration.
  */
-extern int dcd_auto_register(IN struct dcd_manager *hdcd_mgr,
-				    IN char *pszCoffPath);
+extern int dcd_auto_register(struct dcd_manager *hdcd_mgr,
+				    char *pszCoffPath);
 
 /*
  *  ======== dcd_auto_unregister ========
@@ -68,8 +68,8 @@ extern int dcd_auto_register(IN struct dcd_manager *hdcd_mgr,
  *      COFF file to contain the right COFF sections, especially
  *      ".dcd_register", which is used for auto unregistration.
  */
-extern int dcd_auto_unregister(IN struct dcd_manager *hdcd_mgr,
-				      IN char *pszCoffPath);
+extern int dcd_auto_unregister(struct dcd_manager *hdcd_mgr,
+				      char *pszCoffPath);
 
 /*
  *  ======== dcd_create_manager ========
@@ -89,7 +89,7 @@ extern int dcd_auto_unregister(IN struct dcd_manager *hdcd_mgr,
  *  Ensures:
  *      A DCD manager handle is created.
  */
-extern int dcd_create_manager(IN char *pszZlDllName,
+extern int dcd_create_manager(char *pszZlDllName,
 				     OUT struct dcd_manager **phDcdMgr);
 
 /*
@@ -105,7 +105,7 @@ extern int dcd_create_manager(IN char *pszZlDllName,
  *      DCD initialized.
  *  Ensures:
  */
-extern int dcd_destroy_manager(IN struct dcd_manager *hdcd_mgr);
+extern int dcd_destroy_manager(struct dcd_manager *hdcd_mgr);
 
 /*
  *  ======== dcd_enumerate_object ========
@@ -128,8 +128,8 @@ extern int dcd_destroy_manager(IN struct dcd_manager *hdcd_mgr);
  *      This function can be used in conjunction with dcd_get_object_def to
  *      retrieve object properties.
  */
-extern int dcd_enumerate_object(IN s32 index,
-				       IN enum dsp_dcdobjtype obj_type,
+extern int dcd_enumerate_object(s32 index,
+				       enum dsp_dcdobjtype obj_type,
 				       OUT struct dsp_uuid *uuid_obj);
 
 /*
@@ -169,12 +169,12 @@ extern void dcd_exit(void);
  *      pDepLibUuids != NULL.
  *  Ensures:
  */
-extern int dcd_get_dep_libs(IN struct dcd_manager *hdcd_mgr,
-				   IN struct dsp_uuid *uuid_obj,
+extern int dcd_get_dep_libs(struct dcd_manager *hdcd_mgr,
+				   struct dsp_uuid *uuid_obj,
 				   u16 numLibs,
 				   OUT struct dsp_uuid *pDepLibUuids,
 				   OUT bool *pPersistentDepLibs,
-				   IN enum nldr_phase phase);
+				   enum nldr_phase phase);
 
 /*
  *  ======== dcd_get_num_dep_libs ========
@@ -199,11 +199,11 @@ extern int dcd_get_dep_libs(IN struct dcd_manager *hdcd_mgr,
  *      pNumLibs != NULL.
  *  Ensures:
  */
-extern int dcd_get_num_dep_libs(IN struct dcd_manager *hdcd_mgr,
-				       IN struct dsp_uuid *uuid_obj,
+extern int dcd_get_num_dep_libs(struct dcd_manager *hdcd_mgr,
+				       struct dsp_uuid *uuid_obj,
 				       OUT u16 *pNumLibs,
 				       OUT u16 *pNumPersLibs,
-				       IN enum nldr_phase phase);
+				       enum nldr_phase phase);
 
 /*
  *  ======== dcd_get_library_name ========
@@ -229,11 +229,11 @@ extern int dcd_get_num_dep_libs(IN struct dcd_manager *hdcd_mgr,
  *      pdwSize != NULL.
  *  Ensures:
  */
-extern int dcd_get_library_name(IN struct dcd_manager *hdcd_mgr,
-				       IN struct dsp_uuid *uuid_obj,
-				       IN OUT char *pstrLibName,
-				       IN OUT u32 *pdwSize,
-				       IN enum nldr_phase phase,
+extern int dcd_get_library_name(struct dcd_manager *hdcd_mgr,
+				       struct dsp_uuid *uuid_obj,
+				       OUT char *pstrLibName,
+				       OUT u32 *pdwSize,
+				       enum nldr_phase phase,
 				       OUT bool *phase_split);
 
 /*
@@ -261,9 +261,9 @@ extern int dcd_get_library_name(IN struct dcd_manager *hdcd_mgr,
  *      pObjDef is non-NULL.
  *  Ensures:
  */
-extern int dcd_get_object_def(IN struct dcd_manager *hdcd_mgr,
-				     IN struct dsp_uuid *pObjUuid,
-				     IN enum dsp_dcdobjtype obj_type,
+extern int dcd_get_object_def(struct dcd_manager *hdcd_mgr,
+				     struct dsp_uuid *pObjUuid,
+				     enum dsp_dcdobjtype obj_type,
 				     OUT struct dcd_genericobj *pObjDef);
 
 /*
@@ -294,8 +294,8 @@ extern int dcd_get_object_def(IN struct dcd_manager *hdcd_mgr,
  *      COFF file to contain the right COFF sections, especially
  *      ".dcd_register", which is used for auto registration.
  */
-extern int dcd_get_objects(IN struct dcd_manager *hdcd_mgr,
-				  IN char *pszCoffPath,
+extern int dcd_get_objects(struct dcd_manager *hdcd_mgr,
+				  char *pszCoffPath,
 				  dcd_registerfxn registerFxn, void *handle);
 
 /*
@@ -330,9 +330,9 @@ extern bool dcd_init(void);
  *      obj_type is a valid type value.
  *  Ensures:
  */
-extern int dcd_register_object(IN struct dsp_uuid *uuid_obj,
-				      IN enum dsp_dcdobjtype obj_type,
-				      IN char *psz_path_name);
+extern int dcd_register_object(struct dsp_uuid *uuid_obj,
+				      enum dsp_dcdobjtype obj_type,
+				      char *psz_path_name);
 
 /*
  *  ======== dcd_unregister_object ========
@@ -352,7 +352,7 @@ extern int dcd_register_object(IN struct dsp_uuid *uuid_obj,
  *      obj_type is a valid type value.
  *  Ensures:
  */
-extern int dcd_unregister_object(IN struct dsp_uuid *uuid_obj,
-					IN enum dsp_dcdobjtype obj_type);
+extern int dcd_unregister_object(struct dsp_uuid *uuid_obj,
+					enum dsp_dcdobjtype obj_type);
 
 #endif /* _DBDCD_H */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbdcddef.h b/drivers/staging/tidspbridge/include/dspbridge/dbdcddef.h
index d24bec0..1daa4b5 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbdcddef.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbdcddef.h
@@ -71,8 +71,8 @@ struct dcd_genericobj {
 };
 
 /* DCD Internal Callback Type */
-typedef int(*dcd_registerfxn) (IN struct dsp_uuid *uuid_obj,
-				      IN enum dsp_dcdobjtype obj_type,
-				      IN void *handle);
+typedef int(*dcd_registerfxn) (struct dsp_uuid *uuid_obj,
+				      enum dsp_dcdobjtype obj_type,
+				      void *handle);
 
 #endif /* DBDCDDEF_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h
index 126adaa..4c0658d 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dev.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h
@@ -91,7 +91,7 @@ extern u32 dev_brd_write_fxn(void *pArb,
  */
 extern int dev_create_device(OUT struct dev_object
 				    **phDevObject,
-				    IN const char *driver_file_name,
+				    const char *driver_file_name,
 				    struct cfg_devnode *dev_node_obj);
 
 /*
@@ -126,8 +126,8 @@ extern int dev_create_device(OUT struct dev_object
  */
 extern int dev_create_iva_device(OUT struct dev_object
 					**phDevObject,
-					IN const char *driver_file_name,
-					IN const struct cfg_hostres
+					const char *driver_file_name,
+					const struct cfg_hostres
 					*pHostConfig,
 					struct cfg_devnode *dev_node_obj);
 
@@ -149,7 +149,7 @@ extern int dev_create_iva_device(OUT struct dev_object
  *      0 and hdev_obj->hnode_mgr != NULL
  *      else    hdev_obj->hnode_mgr == NULL
  */
-extern int dev_create2(IN struct dev_object *hdev_obj);
+extern int dev_create2(struct dev_object *hdev_obj);
 
 /*
  *  ======== dev_destroy2 ========
@@ -167,7 +167,7 @@ extern int dev_create2(IN struct dev_object *hdev_obj);
  *      0 and hdev_obj->hnode_mgr == NULL
  *      else    -EPERM.
  */
-extern int dev_destroy2(IN struct dev_object *hdev_obj);
+extern int dev_destroy2(struct dev_object *hdev_obj);
 
 /*
  *  ======== dev_destroy_device ========
@@ -490,7 +490,7 @@ extern int dev_get_node_manager(struct dev_object
  *      0:        *pul_value contains the symbol value;
  */
 extern int dev_get_symbol(struct dev_object *hdev_obj,
-				 IN const char *pstrSym, OUT u32 * pul_value);
+				 const char *pstrSym, OUT u32 * pul_value);
 
 /*
  *  ======== dev_get_bridge_context ========
@@ -557,7 +557,7 @@ extern bool dev_init(void);
  *      DEV Initialized.
  *  Ensures:
  */
-extern int dev_is_locked(IN struct dev_object *hdev_obj);
+extern int dev_is_locked(struct dev_object *hdev_obj);
 
 /*
  *  ======== dev_insert_proc_object ========
@@ -582,9 +582,9 @@ extern int dev_is_locked(IN struct dev_object *hdev_obj);
  *      this is the first Processor attaching.
  *      If it is False, there are already processors attached.
  */
-extern int dev_insert_proc_object(IN struct dev_object
+extern int dev_insert_proc_object(struct dev_object
 					 *hdev_obj,
-					 IN u32 proc_obj,
+					 u32 proc_obj,
 					 OUT bool *pbAlreadyAttached);
 
 /*
diff --git a/drivers/staging/tidspbridge/include/dspbridge/disp.h b/drivers/staging/tidspbridge/include/dspbridge/disp.h
index 421b260..abadc79 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/disp.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/disp.h
@@ -50,7 +50,7 @@
  */
 extern int disp_create(OUT struct disp_object **phDispObject,
 			      struct dev_object *hdev_obj,
-			      IN const struct disp_attr *pDispAttrs);
+			      const struct disp_attr *pDispAttrs);
 
 /*
  *  ======== disp_delete ========
@@ -147,7 +147,7 @@ extern int disp_node_create(struct disp_object *hDispObject,
 				   struct node_object *hnode,
 				   u32 ul_fxn_addr,
 				   u32 ul_create_fxn,
-				   IN const struct node_createargs
+				   const struct node_createargs
 				   *pargs, OUT nodeenv *pNodeEnv);
 
 /*
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dmm.h b/drivers/staging/tidspbridge/include/dspbridge/dmm.h
index 1581ebb..72882b7 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dmm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dmm.h
@@ -59,7 +59,7 @@ extern int dmm_delete_tables(struct dmm_object *dmm_mgr);
 
 extern int dmm_create(OUT struct dmm_object **phDmmMgr,
 			     struct dev_object *hdev_obj,
-			     IN const struct dmm_mgrattrs *pMgrAttrs);
+			     const struct dmm_mgrattrs *pMgrAttrs);
 
 extern bool dmm_init(void);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h b/drivers/staging/tidspbridge/include/dspbridge/drv.h
index 020bed0..753a317 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/drv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h
@@ -70,8 +70,8 @@
 #define OMAP_DMMU_BASE 0x5D000000
 #define OMAP_DMMU_SIZE 0x1000
 
-#define OMAP_PRCM_VDD1_DOMAIN 1
-#define OMAP_PRCM_VDD2_DOMAIN 2
+#define OMAP_PRCM_VDD1_DOMA1
+#define OMAP_PRCM_VDD2_DOMA2
 
 /* GPP PROCESS CLEANUP Data structures */
 
@@ -393,7 +393,7 @@ extern int drv_remove_dev_object(struct drv_object *hdrv_obj,
  *      Resource structure is stored in the registry which will be
  *      later used by the CFG module.
  */
-extern int drv_request_resources(IN u32 dw_context,
+extern int drv_request_resources(u32 dw_context,
 					OUT u32 *pDevNodeString);
 
 /*
@@ -410,7 +410,7 @@ extern int drv_request_resources(IN u32 dw_context,
  *      The Resources are released based on Bus type.
  *      Resource structure is deleted from the registry
  */
-extern int drv_release_resources(IN u32 dw_context,
+extern int drv_release_resources(u32 dw_context,
 					struct drv_object *hdrv_obj);
 
 /**
@@ -438,7 +438,7 @@ void bridge_recover_schedule(void);
  *      - MEM initialized.
  *      - valid physical address for the base and size > 0
  */
-extern void mem_ext_phys_pool_init(IN u32 poolPhysBase, IN u32 poolSize);
+extern void mem_ext_phys_pool_init(u32 poolPhysBase, u32 poolSize);
 
 /*
  *  ======== mem_ext_phys_pool_release ========
@@ -462,8 +462,8 @@ extern void mem_ext_phys_pool_release(void);
  *      the size requested.  Returned physical address refers to physical
  *      location of memory.
  */
-extern void *mem_alloc_phys_mem(IN u32 byte_size,
-				IN u32 ulAlign, OUT u32 *pPhysicalAddress);
+extern void *mem_alloc_phys_mem(u32 byte_size,
+				u32 ulAlign, OUT u32 *pPhysicalAddress);
 
 /*
  *  ======== mem_free_phys_mem ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h b/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
index 0eb0d9d..ee71e9b 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
@@ -26,7 +26,7 @@
 
 extern int bridge_chnl_create(OUT struct chnl_mgr **phChnlMgr,
 				     struct dev_object *hdev_obj,
-				     IN const struct chnl_mgrattrs
+				     const struct chnl_mgrattrs
 				     *pMgrAttrs);
 
 extern int bridge_chnl_destroy(struct chnl_mgr *hchnl_mgr);
@@ -35,7 +35,7 @@ extern int bridge_chnl_open(OUT struct chnl_object **phChnl,
 				   struct chnl_mgr *hchnl_mgr,
 				   s8 chnl_mode,
 				   u32 uChnlId,
-				   const IN OPTIONAL struct chnl_attr
+				   const OPTIONAL struct chnl_attr
 				   *pattrs);
 
 extern int bridge_chnl_close(struct chnl_object *chnl_obj);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
index d92f82c..7c86e7b 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
@@ -157,7 +157,7 @@ typedef int(*fxn_brd_memcopy) (struct bridge_dev_context
  */
 typedef int(*fxn_brd_memwrite) (struct bridge_dev_context
 				       * hDevContext,
-				       IN u8 *pHostBuf,
+				       u8 *pHostBuf,
 				       u32 dwDSPAddr, u32 ul_num_bytes,
 				       u32 ulMemType);
 
@@ -287,7 +287,7 @@ typedef int(*fxn_brd_read) (struct bridge_dev_context *hDevContext,
  *  Ensures:
  */
 typedef int(*fxn_brd_write) (struct bridge_dev_context *hDevContext,
-				    IN u8 *pHostBuf,
+				    u8 *pHostBuf,
 				    u32 dwDSPAddr,
 				    u32 ul_num_bytes, u32 ulMemType);
 
@@ -326,7 +326,7 @@ typedef int(*fxn_chnl_create) (OUT struct chnl_mgr
 				      **phChnlMgr,
 				      struct dev_object
 				      * hdev_obj,
-				      IN const struct
+				      const struct
 				      chnl_mgrattrs * pMgrAttrs);
 
 /*
@@ -411,7 +411,7 @@ typedef int(*fxn_chnl_open) (OUT struct chnl_object
 				    struct chnl_mgr *hchnl_mgr,
 				    s8 chnl_mode,
 				    u32 uChnlId,
-				    const IN OPTIONAL struct
+				    const OPTIONAL struct
 				    chnl_attr * pattrs);
 
 /*
@@ -674,7 +674,7 @@ typedef int(*fxn_chnl_registernotify)
  *      DSP configuration information, create a board context, a handle to
  *      which is passed into other Bridge BRD and CHNL functions.  The
  *      board context contains state information for the device. Since the
- *      addresses of all IN pointer parameters may be invalid when this
+ *      addresses of all pointer parameters may be invalid when this
  *      function returns, they must not be stored into the device context
  *      structure.
  */
@@ -682,7 +682,7 @@ typedef int(*fxn_dev_create) (OUT struct bridge_dev_context
 				     **phDevContext,
 				     struct dev_object
 				     * hdev_obj,
-				     IN struct cfg_hostres
+				     struct cfg_hostres
 				     * pConfig);
 
 /*
@@ -702,7 +702,7 @@ typedef int(*fxn_dev_create) (OUT struct bridge_dev_context
  *  Ensures:
  */
 typedef int(*fxn_dev_ctrl) (struct bridge_dev_context *hDevContext,
-				   u32 dw_cmd, IN OUT void *pargs);
+				   u32 dw_cmd, OUT void *pargs);
 
 /*
  *  ======== bridge_dev_destroy ========
@@ -745,7 +745,7 @@ typedef int(*fxn_dev_destroy) (struct bridge_dev_context *hDevContext);
  */
 typedef int(*fxn_io_create) (OUT struct io_mgr **phIOMgr,
 				    struct dev_object *hdev_obj,
-				    IN const struct io_attrs *pMgrAttrs);
+				    const struct io_attrs *pMgrAttrs);
 
 /*
  *  ======== bridge_io_destroy ========
@@ -915,7 +915,7 @@ typedef int(*fxn_msg_get) (struct msg_queue *msg_queue_obj,
  *  Ensures:
  */
 typedef int(*fxn_msg_put) (struct msg_queue *msg_queue_obj,
-				  IN const struct dsp_msg *pmsg, u32 utimeout);
+				  const struct dsp_msg *pmsg, u32 utimeout);
 
 /*
  *  ======== bridge_msg_register_notify ========
@@ -1048,6 +1048,6 @@ struct bridge_drv_interface {
  *      Called during the Device_Init phase.
  */
 void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
-		   IN const char *driver_file_name);
+		   const char *driver_file_name);
 
 #endif /* DSPDEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspio.h b/drivers/staging/tidspbridge/include/dspbridge/dspio.h
index 563b779..f382f1a 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspio.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspio.h
@@ -28,14 +28,14 @@
 
 extern int bridge_io_create(OUT struct io_mgr **phIOMgr,
 				   struct dev_object *hdev_obj,
-				   IN const struct io_attrs *pMgrAttrs);
+				   const struct io_attrs *pMgrAttrs);
 
 extern int bridge_io_destroy(struct io_mgr *hio_mgr);
 
 extern int bridge_io_on_loaded(struct io_mgr *hio_mgr);
 
 extern int iva_io_on_loaded(struct io_mgr *hio_mgr);
-extern int bridge_io_get_proc_load(IN struct io_mgr *hio_mgr,
+extern int bridge_io_get_proc_load(struct io_mgr *hio_mgr,
 				       OUT struct dsp_procloadstat *pProcStat);
 
 #endif /* DSPIO_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h b/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
index d01d756..3b9ca4e 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
@@ -42,7 +42,7 @@ extern int bridge_msg_get(struct msg_queue *msg_queue_obj,
 				 struct dsp_msg *pmsg, u32 utimeout);
 
 extern int bridge_msg_put(struct msg_queue *msg_queue_obj,
-				 IN const struct dsp_msg *pmsg, u32 utimeout);
+				 const struct dsp_msg *pmsg, u32 utimeout);
 
 extern int bridge_msg_register_notify(struct msg_queue *msg_queue_obj,
 					  u32 event_mask,
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io.h b/drivers/staging/tidspbridge/include/dspbridge/io.h
index 0a25829..8241547 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io.h
@@ -51,7 +51,7 @@
  */
 extern int io_create(OUT struct io_mgr **phIOMgr,
 			    struct dev_object *hdev_obj,
-			    IN const struct io_attrs *pMgrAttrs);
+			    const struct io_attrs *pMgrAttrs);
 
 /*
  *  ======== io_destroy ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
index 0befe90..64cb274 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
@@ -78,7 +78,7 @@ extern void io_cancel_chnl(struct io_mgr *hio_mgr, u32 ulChnl);
  *  Ensures:
  *      Non-preemptible (but interruptible).
  */
-extern void io_dpc(IN OUT unsigned long pRefData);
+extern void io_dpc(OUT unsigned long pRefData);
 
 /*
  *  ======== io_mbox_msg ========
@@ -287,7 +287,7 @@ extern void io_or_set_value(struct bridge_dev_context *hDevContext,
 extern void io_and_set_value(struct bridge_dev_context *hDevContext,
 			     u32 dwDSPAddr, u32 dwValue);
 
-extern void io_intr_dsp2(IN struct io_mgr *pio_mgr, IN u16 mb_val);
+extern void io_intr_dsp2(struct io_mgr *pio_mgr, u16 mb_val);
 
 extern void io_sm_init(void);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/mgr.h b/drivers/staging/tidspbridge/include/dspbridge/mgr.h
index ce418ae..adfd9b5 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/mgr.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/mgr.h
@@ -185,7 +185,7 @@ extern void mgr_exit(void);
  *      0 and *phDCDHandle != NULL ||
  *      -EPERM and *phDCDHandle == NULL
  */
-extern int mgr_get_dcd_handle(IN struct mgr_object
+extern int mgr_get_dcd_handle(struct mgr_object
 				     *hMGRHandle, OUT u32 *phDCDHandle);
 
 /*
diff --git a/drivers/staging/tidspbridge/include/dspbridge/nldr.h b/drivers/staging/tidspbridge/include/dspbridge/nldr.h
index 14bea86..d8c9688 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/nldr.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/nldr.h
@@ -26,14 +26,14 @@
 #define NLDR_
 
 extern int nldr_allocate(struct nldr_object *nldr_obj,
-				void *priv_ref, IN const struct dcd_nodeprops
+				void *priv_ref, const struct dcd_nodeprops
 				*node_props,
 				OUT struct nldr_nodeobject **phNldrNode,
-				IN bool *pf_phase_split);
+				bool *pf_phase_split);
 
 extern int nldr_create(OUT struct nldr_object **phNldr,
 			      struct dev_object *hdev_obj,
-			      IN const struct nldr_attrs *pattrs);
+			      const struct nldr_attrs *pattrs);
 
 extern void nldr_delete(struct nldr_object *nldr_obj);
 extern void nldr_exit(void);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h b/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
index abe44a5..2f9bea3 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
@@ -129,7 +129,7 @@ enum nldr_phase {
  */
 typedef int(*nldr_allocatefxn) (struct nldr_object *nldr_obj,
 				       void *priv_ref,
-				       IN const struct dcd_nodeprops
+				       const struct dcd_nodeprops
 				       * node_props,
 				       OUT struct nldr_nodeobject
 				       **phNldrNode,
@@ -158,7 +158,7 @@ typedef int(*nldr_allocatefxn) (struct nldr_object *nldr_obj,
  */
 typedef int(*nldr_createfxn) (OUT struct nldr_object **phNldr,
 				     struct dev_object *hdev_obj,
-				     IN const struct nldr_attrs *pattrs);
+				     const struct nldr_attrs *pattrs);
 
 /*
  *  ======== nldr_delete ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/node.h b/drivers/staging/tidspbridge/include/dspbridge/node.h
index 4c6c31b..7f16f6f 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/node.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/node.h
@@ -56,9 +56,9 @@
  *      error:              *ph_node == NULL.
  */
 extern int node_allocate(struct proc_object *hprocessor,
-				IN const struct dsp_uuid *pNodeId,
-				OPTIONAL IN const struct dsp_cbdata
-				*pargs, OPTIONAL IN const struct dsp_nodeattrin
+				const struct dsp_uuid *pNodeId,
+				OPTIONAL const struct dsp_cbdata
+				*pargs, OPTIONAL const struct dsp_nodeattrin
 				*attr_in,
 				OUT struct node_object **ph_node,
 				struct process_context *pr_ctxt);
@@ -182,8 +182,8 @@ extern int node_connect(struct node_object *hNode1,
 			       u32 uStream1,
 			       struct node_object *hNode2,
 			       u32 uStream2,
-			       OPTIONAL IN struct dsp_strmattr *pattrs,
-			       OPTIONAL IN struct dsp_cbdata
+			       OPTIONAL struct dsp_strmattr *pattrs,
+			       OPTIONAL struct dsp_cbdata
 			       *conn_param);
 
 /*
@@ -334,7 +334,7 @@ extern void node_exit(void);
  *  Ensures:
  */
 extern int node_free_msg_buf(struct node_object *hnode,
-				    IN u8 *pbuffer,
+				    u8 *pbuffer,
 				    OPTIONAL struct dsp_bufferattr
 				    *pattr);
 
@@ -470,7 +470,7 @@ extern int node_pause(struct node_object *hnode);
  *  Ensures:
  */
 extern int node_put_message(struct node_object *hnode,
-				   IN const struct dsp_msg *pmsg, u32 utimeout);
+				   const struct dsp_msg *pmsg, u32 utimeout);
 
 /*
  *  ======== node_register_notify ========
@@ -554,7 +554,7 @@ extern int node_terminate(struct node_object *hnode,
  *
  */
 extern int node_get_uuid_props(void *hprocessor,
-				      IN const struct dsp_uuid *pNodeId,
+				      const struct dsp_uuid *pNodeId,
 				      OUT struct dsp_ndbprops
 				      *node_props);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/proc.h b/drivers/staging/tidspbridge/include/dspbridge/proc.h
index 9ad0934..a06ddc4 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/proc.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/proc.h
@@ -99,7 +99,7 @@ extern int proc_auto_start(struct cfg_devnode *dev_node_obj,
  *      This function Calls bridge_dev_ctrl.
  */
 extern int proc_ctrl(void *hprocessor,
-			    u32 dw_cmd, IN struct dsp_cbdata *pargs);
+			    u32 dw_cmd, struct dsp_cbdata *pargs);
 
 /*
  *  ======== proc_detach ========
@@ -152,7 +152,7 @@ extern int proc_detach(struct process_context *pr_ctxt);
  */
 extern int proc_enum_nodes(void *hprocessor,
 				  void **node_tab,
-				  IN u32 node_tab_size,
+				  u32 node_tab_size,
 				  OUT u32 *pu_num_nodes,
 				  OUT u32 *pu_allocated);
 
@@ -329,8 +329,8 @@ extern int proc_get_trace(void *hprocessor, u8 * pbuf, u32 max_size);
  *      can load the processor.
  */
 extern int proc_load(void *hprocessor,
-			    IN const s32 argc_index, IN const char **user_args,
-			    IN const char **user_envp);
+			    const s32 argc_index, const char **user_args,
+			    const char **user_envp);
 
 /*
  *  ======== proc_register_notify ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/pwr.h b/drivers/staging/tidspbridge/include/dspbridge/pwr.h
index 5fc85ea..692cb00 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/pwr.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/pwr.h
@@ -45,7 +45,7 @@
  *      -EPERM:          General failure, unable to send sleep command to
  *                          the DSP.
  */
-extern int pwr_sleep_dsp(IN const u32 sleepCode, IN const u32 timeout);
+extern int pwr_sleep_dsp(const u32 sleepCode, const u32 timeout);
 
 /*
  *  ======== pwr_wake_dsp ========
@@ -66,7 +66,7 @@ extern int pwr_sleep_dsp(IN const u32 sleepCode, IN const u32 timeout);
  *      -EPERM:          General failure, unable to send wake command to
  *                          the DSP.
  */
-extern int pwr_wake_dsp(IN const u32 timeout);
+extern int pwr_wake_dsp(const u32 timeout);
 
 /*
  *  ======== pwr_pm_pre_scale ========
@@ -84,7 +84,7 @@ extern int pwr_wake_dsp(IN const u32 timeout);
  *      -EPERM:          General failure, unable to send wake command to
  *                          the DSP.
  */
-extern int pwr_pm_pre_scale(IN u16 voltage_domain, u32 level);
+extern int pwr_pm_pre_scale(u16 voltage_domain, u32 level);
 
 /*
  *  ======== pwr_pm_post_scale ========
@@ -102,6 +102,6 @@ extern int pwr_pm_pre_scale(IN u16 voltage_domain, u32 level);
  *      -EPERM:          General failure, unable to send wake command to
  *                          the DSP.
  */
-extern int pwr_pm_post_scale(IN u16 voltage_domain, u32 level);
+extern int pwr_pm_post_scale(u16 voltage_domain, u32 level);
 
 #endif /* PWR_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/strm.h b/drivers/staging/tidspbridge/include/dspbridge/strm.h
index b85a460..7b7a243 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/strm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/strm.h
@@ -240,8 +240,8 @@ extern bool strm_init(void);
  *      pbuf != NULL.
  *  Ensures:
  */
-extern int strm_issue(struct strm_object *hStrm, IN u8 * pbuf,
-			     u32 ul_bytes, u32 ul_buf_size, IN u32 dw_arg);
+extern int strm_issue(struct strm_object *hStrm, u8 * pbuf,
+			     u32 ul_bytes, u32 ul_buf_size, u32 dw_arg);
 
 /*
  *  ======== strm_open ========
@@ -271,7 +271,7 @@ extern int strm_issue(struct strm_object *hStrm, IN u8 * pbuf,
  *      error:          *phStrm == NULL.
  */
 extern int strm_open(struct node_object *hnode, u32 dir,
-			    u32 index, IN struct strm_attr *pattr,
+			    u32 index, struct strm_attr *pattr,
 			    OUT struct strm_object **phStrm,
 			    struct process_context *pr_ctxt);
 
@@ -376,7 +376,7 @@ extern int strm_register_notify(struct strm_object *hStrm,
  *      0:        *pmask != 0 || utimeout == 0.
  *      Error:          *pmask == 0.
  */
-extern int strm_select(IN struct strm_object **strm_tab,
+extern int strm_select(struct strm_object **strm_tab,
 			      u32 nStrms, OUT u32 *pmask, u32 utimeout);
 
 /*
diff --git a/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h b/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h
index d7d0962..a7a64f2 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h
@@ -38,7 +38,7 @@
  *  Details:
  *      UUID string limit currently set at MAXUUIDLEN.
  */
-void uuid_uuid_to_string(IN struct dsp_uuid *uuid_obj, OUT char *pszUuid,
+void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, OUT char *pszUuid,
 			 s32 size);
 
 /*
@@ -56,7 +56,7 @@ void uuid_uuid_to_string(IN struct dsp_uuid *uuid_obj, OUT char *pszUuid,
  *      We assume the string representation of a UUID has the following format:
  *      "12345678_1234_1234_1234_123456789abc".
  */
-extern void uuid_uuid_from_string(IN char *pszUuid,
+extern void uuid_uuid_from_string(char *pszUuid,
 				  OUT struct dsp_uuid *uuid_obj);
 
 #endif /* UUIDUTIL_ */
diff --git a/drivers/staging/tidspbridge/pmgr/chnl.c b/drivers/staging/tidspbridge/pmgr/chnl.c
index d2c089c..c9787fb 100644
--- a/drivers/staging/tidspbridge/pmgr/chnl.c
+++ b/drivers/staging/tidspbridge/pmgr/chnl.c
@@ -53,7 +53,7 @@ static u32 refs;
  */
 int chnl_create(OUT struct chnl_mgr **phChnlMgr,
 		       struct dev_object *hdev_obj,
-		       IN const struct chnl_mgrattrs *pMgrAttrs)
+		       const struct chnl_mgrattrs *pMgrAttrs)
 {
 	int status;
 	struct chnl_mgr *hchnl_mgr;
diff --git a/drivers/staging/tidspbridge/pmgr/cmm.c b/drivers/staging/tidspbridge/pmgr/cmm.c
index 160aa36..9f9b5c5 100644
--- a/drivers/staging/tidspbridge/pmgr/cmm.c
+++ b/drivers/staging/tidspbridge/pmgr/cmm.c
@@ -242,7 +242,7 @@ void *cmm_calloc_buf(struct cmm_object *hcmm_mgr, u32 usize,
  */
 int cmm_create(OUT struct cmm_object **ph_cmm_mgr,
 		      struct dev_object *hdev_obj,
-		      IN const struct cmm_mgrattrs *pMgrAttrs)
+		      const struct cmm_mgrattrs *pMgrAttrs)
 {
 	struct cmm_object *cmm_obj = NULL;
 	int status = 0;
@@ -1075,7 +1075,7 @@ int cmm_xlator_free_buf(struct cmm_xlatorobject *xlator, void *pBufVa)
  *  Purpose:
  *      Set/Get translator info.
  */
-int cmm_xlator_info(struct cmm_xlatorobject *xlator, IN OUT u8 ** paddr,
+int cmm_xlator_info(struct cmm_xlatorobject *xlator, OUT u8 ** paddr,
 			   u32 ul_size, u32 uSegId, bool set_info)
 {
 	struct cmm_xlator *xlator_obj = (struct cmm_xlator *)xlator;
diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c
index 61bdaa9..859c2ff 100644
--- a/drivers/staging/tidspbridge/pmgr/cod.c
+++ b/drivers/staging/tidspbridge/pmgr/cod.c
@@ -217,7 +217,7 @@ void cod_close(struct cod_libraryobj *lib)
  *
  */
 int cod_create(OUT struct cod_manager **phMgr, char *pstrDummyFile,
-		      IN OPTIONAL const struct cod_attrs *attrs)
+		      OPTIONAL const struct cod_attrs *attrs)
 {
 	struct cod_manager *mgr_new;
 	struct dbll_attrs zl_attrs;
@@ -397,7 +397,7 @@ int cod_get_loader(struct cod_manager *cod_mgr_obj,
  *      Retrieve the starting address and length of a section in the COFF file
  *      given the section name.
  */
-int cod_get_section(struct cod_libraryobj *lib, IN char *pstrSect,
+int cod_get_section(struct cod_libraryobj *lib, char *pstrSect,
 			   OUT u32 *puAddr, OUT u32 *puLen)
 {
 	struct cod_manager *cod_mgr_obj;
@@ -551,7 +551,7 @@ int cod_load_base(struct cod_manager *hmgr, u32 nArgc, char *args[],
  *  ======== cod_open ========
  *      Open library for reading sections.
  */
-int cod_open(struct cod_manager *hmgr, IN char *pszCoffPath,
+int cod_open(struct cod_manager *hmgr, char *pszCoffPath,
 		    u32 flags, struct cod_libraryobj **pLib)
 {
 	int status = 0;
@@ -588,7 +588,7 @@ int cod_open(struct cod_manager *hmgr, IN char *pszCoffPath,
  *  Purpose:
  *      Open base image for reading sections.
  */
-int cod_open_base(struct cod_manager *hmgr, IN char *pszCoffPath,
+int cod_open_base(struct cod_manager *hmgr, char *pszCoffPath,
 			 dbll_flags flags)
 {
 	int status = 0;
@@ -626,8 +626,8 @@ int cod_open_base(struct cod_manager *hmgr, IN char *pszCoffPath,
  *  Purpose:
  *      Retrieve the content of a code section given the section name.
  */
-int cod_read_section(struct cod_libraryobj *lib, IN char *pstrSect,
-			    OUT char *pstrContent, IN u32 content_size)
+int cod_read_section(struct cod_libraryobj *lib, char *pstrSect,
+			    OUT char *pstrContent, u32 content_size)
 {
 	int status = 0;
 
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index d95167d..4e4b20a 100644
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -132,7 +132,7 @@ u32 dev_brd_write_fxn(void *pArb, u32 ulDspAddr, void *pHostBuf,
  *      PM board (device).
  */
 int dev_create_device(OUT struct dev_object **phDevObject,
-			     IN const char *driver_file_name,
+			     const char *driver_file_name,
 			     struct cfg_devnode *dev_node_obj)
 {
 	struct cfg_hostres *host_res;
@@ -691,7 +691,7 @@ int dev_get_node_manager(struct dev_object *hdev_obj,
  *  ======== dev_get_symbol ========
  */
 int dev_get_symbol(struct dev_object *hdev_obj,
-			  IN const char *pstrSym, OUT u32 * pul_value)
+			  const char *pstrSym, OUT u32 * pul_value)
 {
 	int status = 0;
 	struct cod_manager *cod_mgr;
diff --git a/drivers/staging/tidspbridge/pmgr/dmm.c b/drivers/staging/tidspbridge/pmgr/dmm.c
index 23c932c..633e77d 100644
--- a/drivers/staging/tidspbridge/pmgr/dmm.c
+++ b/drivers/staging/tidspbridge/pmgr/dmm.c
@@ -119,7 +119,7 @@ int dmm_create_tables(struct dmm_object *dmm_mgr, u32 addr, u32 size)
  */
 int dmm_create(OUT struct dmm_object **phDmmMgr,
 		      struct dev_object *hdev_obj,
-		      IN const struct dmm_mgrattrs *pMgrAttrs)
+		      const struct dmm_mgrattrs *pMgrAttrs)
 {
 	struct dmm_object *dmm_obj = NULL;
 	int status = 0;
diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
index 4667507..2d43031 100644
--- a/drivers/staging/tidspbridge/pmgr/dspapi.c
+++ b/drivers/staging/tidspbridge/pmgr/dspapi.c
@@ -1127,7 +1127,7 @@ u32 nodewrap_alloc_msg_buf(union Trapped_Args *args, void *pr_ctxt)
 			pattr = &attr;
 
 	}
-	/* IN OUT argument */
+	/* OUT argument */
 	CP_FM_USR(&pbuffer, args->args_node_allocmsgbuf.pbuffer, status, 1);
 	if (DSP_SUCCEEDED(status)) {
 		status = node_alloc_msg_buf(args->args_node_allocmsgbuf.hnode,
diff --git a/drivers/staging/tidspbridge/pmgr/io.c b/drivers/staging/tidspbridge/pmgr/io.c
index 83171f1..e8f006a 100644
--- a/drivers/staging/tidspbridge/pmgr/io.c
+++ b/drivers/staging/tidspbridge/pmgr/io.c
@@ -47,7 +47,7 @@ static u32 refs;
  *      CHNL and msg_ctrl
  */
 int io_create(OUT struct io_mgr **phIOMgr, struct dev_object *hdev_obj,
-		     IN const struct io_attrs *pMgrAttrs)
+		     const struct io_attrs *pMgrAttrs)
 {
 	struct bridge_drv_interface *intf_fxns;
 	struct io_mgr *hio_mgr = NULL;
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c
index 169bb15..61c47b0 100644
--- a/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -67,21 +67,21 @@ static int get_attrs_from_buf(char *psz_buf, u32 ul_buf_size,
 				     struct dcd_genericobj *pGenObj);
 static void compress_buf(char *psz_buf, u32 ul_buf_size, s32 char_size);
 static char dsp_char2_gpp_char(char *pWord, s32 dsp_char_size);
-static int get_dep_lib_info(IN struct dcd_manager *hdcd_mgr,
-				   IN struct dsp_uuid *uuid_obj,
-				   IN OUT u16 *pNumLibs,
+static int get_dep_lib_info(struct dcd_manager *hdcd_mgr,
+				   struct dsp_uuid *uuid_obj,
+				   OUT u16 *pNumLibs,
 				   OPTIONAL OUT u16 *pNumPersLibs,
 				   OPTIONAL OUT struct dsp_uuid *pDepLibUuids,
 				   OPTIONAL OUT bool *pPersistentDepLibs,
-				   IN enum nldr_phase phase);
+				   enum nldr_phase phase);
 
 /*
  *  ======== dcd_auto_register ========
  *  Purpose:
  *      Parses the supplied image and resigsters with DCD.
  */
-int dcd_auto_register(IN struct dcd_manager *hdcd_mgr,
-			     IN char *pszCoffPath)
+int dcd_auto_register(struct dcd_manager *hdcd_mgr,
+			     char *pszCoffPath)
 {
 	int status = 0;
 
@@ -102,8 +102,8 @@ int dcd_auto_register(IN struct dcd_manager *hdcd_mgr,
  *  Purpose:
  *      Parses the supplied DSP image and unresiters from DCD.
  */
-int dcd_auto_unregister(IN struct dcd_manager *hdcd_mgr,
-			       IN char *pszCoffPath)
+int dcd_auto_unregister(struct dcd_manager *hdcd_mgr,
+			       char *pszCoffPath)
 {
 	int status = 0;
 
@@ -124,7 +124,7 @@ int dcd_auto_unregister(IN struct dcd_manager *hdcd_mgr,
  *  Purpose:
  *      Creates DCD manager.
  */
-int dcd_create_manager(IN char *pszZlDllName,
+int dcd_create_manager(char *pszZlDllName,
 			      OUT struct dcd_manager **phDcdMgr)
 {
 	struct cod_manager *cod_mgr;	/* COD manager handle */
@@ -168,7 +168,7 @@ func_end:
  *  Purpose:
  *      Frees DCD Manager object.
  */
-int dcd_destroy_manager(IN struct dcd_manager *hdcd_mgr)
+int dcd_destroy_manager(struct dcd_manager *hdcd_mgr)
 {
 	struct dcd_manager *dcd_mgr_obj = hdcd_mgr;
 	int status = -EFAULT;
@@ -193,7 +193,7 @@ int dcd_destroy_manager(IN struct dcd_manager *hdcd_mgr)
  *  Purpose:
  *      Enumerates objects in the DCD.
  */
-int dcd_enumerate_object(IN s32 index, IN enum dsp_dcdobjtype obj_type,
+int dcd_enumerate_object(s32 index, enum dsp_dcdobjtype obj_type,
 				OUT struct dsp_uuid *uuid_obj)
 {
 	int status = 0;
@@ -325,11 +325,11 @@ void dcd_exit(void)
 /*
  *  ======== dcd_get_dep_libs ========
  */
-int dcd_get_dep_libs(IN struct dcd_manager *hdcd_mgr,
-			    IN struct dsp_uuid *uuid_obj,
+int dcd_get_dep_libs(struct dcd_manager *hdcd_mgr,
+			    struct dsp_uuid *uuid_obj,
 			    u16 numLibs, OUT struct dsp_uuid *pDepLibUuids,
 			    OUT bool *pPersistentDepLibs,
-			    IN enum nldr_phase phase)
+			    enum nldr_phase phase)
 {
 	int status = 0;
 
@@ -349,10 +349,10 @@ int dcd_get_dep_libs(IN struct dcd_manager *hdcd_mgr,
 /*
  *  ======== dcd_get_num_dep_libs ========
  */
-int dcd_get_num_dep_libs(IN struct dcd_manager *hdcd_mgr,
-				IN struct dsp_uuid *uuid_obj,
+int dcd_get_num_dep_libs(struct dcd_manager *hdcd_mgr,
+				struct dsp_uuid *uuid_obj,
 				OUT u16 *pNumLibs, OUT u16 *pNumPersLibs,
-				IN enum nldr_phase phase)
+				enum nldr_phase phase)
 {
 	int status = 0;
 
@@ -374,9 +374,9 @@ int dcd_get_num_dep_libs(IN struct dcd_manager *hdcd_mgr,
  *      Retrieves the properties of a node or processor based on the UUID and
  *      object type.
  */
-int dcd_get_object_def(IN struct dcd_manager *hdcd_mgr,
-			      IN struct dsp_uuid *pObjUuid,
-			      IN enum dsp_dcdobjtype obj_type,
+int dcd_get_object_def(struct dcd_manager *hdcd_mgr,
+			      struct dsp_uuid *pObjUuid,
+			      enum dsp_dcdobjtype obj_type,
 			      OUT struct dcd_genericobj *pObjDef)
 {
 	struct dcd_manager *dcd_mgr_obj = hdcd_mgr;	/* ptr to DCD mgr */
@@ -533,8 +533,8 @@ func_end:
 /*
  *  ======== dcd_get_objects ========
  */
-int dcd_get_objects(IN struct dcd_manager *hdcd_mgr,
-			   IN char *pszCoffPath, dcd_registerfxn registerFxn,
+int dcd_get_objects(struct dcd_manager *hdcd_mgr,
+			   char *pszCoffPath, dcd_registerfxn registerFxn,
 			   void *handle)
 {
 	struct dcd_manager *dcd_mgr_obj = hdcd_mgr;
@@ -642,9 +642,9 @@ func_end:
  *      Retrieves the library name for the given UUID.
  *
  */
-int dcd_get_library_name(IN struct dcd_manager *hdcd_mgr,
-				IN struct dsp_uuid *uuid_obj,
-				IN OUT char *pstrLibName, IN OUT u32 * pdwSize,
+int dcd_get_library_name(struct dcd_manager *hdcd_mgr,
+				struct dsp_uuid *uuid_obj,
+				OUT char *pstrLibName, OUT u32 * pdwSize,
 				enum nldr_phase phase, OUT bool *phase_split)
 {
 	char sz_reg_key[DCD_MAXPATHLENGTH];
@@ -810,9 +810,9 @@ bool dcd_init(void)
  *      Registers a node or a processor with the DCD.
  *      If psz_path_name == NULL, unregister the specified DCD object.
  */
-int dcd_register_object(IN struct dsp_uuid *uuid_obj,
-			       IN enum dsp_dcdobjtype obj_type,
-			       IN char *psz_path_name)
+int dcd_register_object(struct dsp_uuid *uuid_obj,
+			       enum dsp_dcdobjtype obj_type,
+			       char *psz_path_name)
 {
 	int status = 0;
 	char sz_reg_key[DCD_MAXPATHLENGTH];
@@ -972,8 +972,8 @@ func_end:
  *  Call DCD_Register object with psz_path_name set to NULL to
  *  perform actual object de-registration.
  */
-int dcd_unregister_object(IN struct dsp_uuid *uuid_obj,
-				 IN enum dsp_dcdobjtype obj_type)
+int dcd_unregister_object(struct dsp_uuid *uuid_obj,
+				 enum dsp_dcdobjtype obj_type)
 {
 	int status = 0;
 
@@ -1389,9 +1389,9 @@ static char dsp_char2_gpp_char(char *pWord, s32 dsp_char_size)
 /*
  *  ======== get_dep_lib_info ========
  */
-static int get_dep_lib_info(IN struct dcd_manager *hdcd_mgr,
-				   IN struct dsp_uuid *uuid_obj,
-				   IN OUT u16 *pNumLibs,
+static int get_dep_lib_info(struct dcd_manager *hdcd_mgr,
+				   struct dsp_uuid *uuid_obj,
+				   OUT u16 *pNumLibs,
 				   OPTIONAL OUT u16 *pNumPersLibs,
 				   OPTIONAL OUT struct dsp_uuid *pDepLibUuids,
 				   OPTIONAL OUT bool *pPersistentDepLibs,
diff --git a/drivers/staging/tidspbridge/rmgr/disp.c b/drivers/staging/tidspbridge/rmgr/disp.c
index a1defff..cb50077 100644
--- a/drivers/staging/tidspbridge/rmgr/disp.c
+++ b/drivers/staging/tidspbridge/rmgr/disp.c
@@ -89,7 +89,7 @@ static int send_message(struct disp_object *disp_obj, u32 dwTimeout,
  */
 int disp_create(OUT struct disp_object **phDispObject,
 		       struct dev_object *hdev_obj,
-		       IN const struct disp_attr *pDispAttrs)
+		       const struct disp_attr *pDispAttrs)
 {
 	struct disp_object *disp_obj;
 	struct bridge_drv_interface *intf_fxns;
@@ -251,7 +251,7 @@ int disp_node_change_priority(struct disp_object *disp_obj,
 int disp_node_create(struct disp_object *disp_obj,
 			    struct node_object *hnode, u32 ulRMSFxn,
 			    u32 ul_create_fxn,
-			    IN const struct node_createargs *pargs,
+			    const struct node_createargs *pargs,
 			    OUT nodeenv *pNodeEnv)
 {
 	struct node_msgargs node_msg_args;
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c
index b4f7620..bad1b8f 100644
--- a/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -287,7 +287,7 @@ static u32 refs;		/* module reference count */
 static int add_ovly_info(void *handle, struct dbll_sect_info *sect_info,
 				u32 addr, u32 bytes);
 static int add_ovly_node(struct dsp_uuid *uuid_obj,
-				enum dsp_dcdobjtype obj_type, IN void *handle);
+				enum dsp_dcdobjtype obj_type, void *handle);
 static int add_ovly_sect(struct nldr_object *nldr_obj,
 				struct ovly_sect **pList,
 				struct dbll_sect_info *pSectInfo,
@@ -324,9 +324,9 @@ static u32 find_gcf(u32 a, u32 b);
  *  ======== nldr_allocate ========
  */
 int nldr_allocate(struct nldr_object *nldr_obj, void *priv_ref,
-			 IN const struct dcd_nodeprops *node_props,
+			 const struct dcd_nodeprops *node_props,
 			 OUT struct nldr_nodeobject **phNldrNode,
-			 IN bool *pf_phase_split)
+			 bool *pf_phase_split)
 {
 	struct nldr_nodeobject *nldr_node_obj = NULL;
 	int status = 0;
@@ -426,7 +426,7 @@ int nldr_allocate(struct nldr_object *nldr_obj, void *priv_ref,
  */
 int nldr_create(OUT struct nldr_object **phNldr,
 		       struct dev_object *hdev_obj,
-		       IN const struct nldr_attrs *pattrs)
+		       const struct nldr_attrs *pattrs)
 {
 	struct cod_manager *cod_mgr;	/* COD manager */
 	char *psz_coff_buf = NULL;
@@ -1012,7 +1012,7 @@ func_end:
  *  Callback function passed to dcd_get_objects.
  */
 static int add_ovly_node(struct dsp_uuid *uuid_obj,
-				enum dsp_dcdobjtype obj_type, IN void *handle)
+				enum dsp_dcdobjtype obj_type, void *handle)
 {
 	struct nldr_object *nldr_obj = (struct nldr_object *)handle;
 	char *node_name = NULL;
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index e5851bb..c19e1bf 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -291,9 +291,9 @@ enum node_state node_get_state(void *hnode)
  *      Allocate GPP resources to manage a node on the DSP.
  */
 int node_allocate(struct proc_object *hprocessor,
-			 IN const struct dsp_uuid *pNodeId,
-			 OPTIONAL IN const struct dsp_cbdata *pargs,
-			 OPTIONAL IN const struct dsp_nodeattrin *attr_in,
+			 const struct dsp_uuid *pNodeId,
+			 OPTIONAL const struct dsp_cbdata *pargs,
+			 OPTIONAL const struct dsp_nodeattrin *attr_in,
 			 OUT struct node_object **ph_node,
 			 struct process_context *pr_ctxt)
 {
@@ -685,7 +685,7 @@ func_end:
  *      Allocates buffer for zero copy messaging.
  */
 DBAPI node_alloc_msg_buf(struct node_object *hnode, u32 usize,
-			 OPTIONAL IN OUT struct dsp_bufferattr *pattr,
+			 OPTIONAL OUT struct dsp_bufferattr *pattr,
 			 OUT u8 **pbuffer)
 {
 	struct node_object *pnode = (struct node_object *)hnode;
@@ -833,8 +833,8 @@ func_end:
  */
 int node_connect(struct node_object *hNode1, u32 uStream1,
 			struct node_object *hNode2,
-			u32 uStream2, OPTIONAL IN struct dsp_strmattr *pattrs,
-			OPTIONAL IN struct dsp_cbdata *conn_param)
+			u32 uStream2, OPTIONAL struct dsp_strmattr *pattrs,
+			OPTIONAL struct dsp_cbdata *conn_param)
 {
 	struct node_mgr *hnode_mgr;
 	char *pstr_dev_name = NULL;
@@ -1673,7 +1673,7 @@ void node_exit(void)
  *  Purpose:
  *      Frees the message buffer.
  */
-int node_free_msg_buf(struct node_object *hnode, IN u8 * pbuffer,
+int node_free_msg_buf(struct node_object *hnode, u8 * pbuffer,
 			     OPTIONAL struct dsp_bufferattr *pattr)
 {
 	struct node_object *pnode = (struct node_object *)hnode;
@@ -2094,7 +2094,7 @@ func_end:
  *      message, or a timeout occurs.
  */
 int node_put_message(struct node_object *hnode,
-			    IN const struct dsp_msg *pmsg, u32 utimeout)
+			    const struct dsp_msg *pmsg, u32 utimeout)
 {
 	struct node_mgr *hnode_mgr = NULL;
 	enum node_type node_type;
@@ -3004,7 +3004,7 @@ static int get_proc_props(struct node_mgr *hnode_mgr,
  *      Fetch Node UUID properties from DCD/DOF file.
  */
 int node_get_uuid_props(void *hprocessor,
-			       IN const struct dsp_uuid *pNodeId,
+			       const struct dsp_uuid *pNodeId,
 			       OUT struct dsp_ndbprops *node_props)
 {
 	struct node_mgr *hnode_mgr = NULL;
diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index 8ca7852..e95d44c 100644
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -492,7 +492,7 @@ func_end:
  *      Call the bridge_dev_ctrl fxn with the Argument. This is a Synchronous
  *      Operation. arg can be null.
  */
-int proc_ctrl(void *hprocessor, u32 dw_cmd, IN struct dsp_cbdata * arg)
+int proc_ctrl(void *hprocessor, u32 dw_cmd, struct dsp_cbdata * arg)
 {
 	int status = 0;
 	struct proc_object *p_proc_object = hprocessor;
@@ -582,7 +582,7 @@ int proc_detach(struct process_context *pr_ctxt)
  *      on a DSP processor.
  */
 int proc_enum_nodes(void *hprocessor, void **node_tab,
-			   IN u32 node_tab_size, OUT u32 *pu_num_nodes,
+			   u32 node_tab_size, OUT u32 *pu_num_nodes,
 			   OUT u32 *pu_allocated)
 {
 	int status = -EPERM;
@@ -1055,8 +1055,8 @@ bool proc_init(void)
  *      This will be an OEM-only function, and not part of the DSP/BIOS Bridge
  *      application developer's API.
  */
-int proc_load(void *hprocessor, IN const s32 argc_index,
-		     IN const char **user_args, IN const char **user_envp)
+int proc_load(void *hprocessor, const s32 argc_index,
+		     const char **user_args, const char **user_envp)
 {
 	int status = 0;
 	struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
diff --git a/drivers/staging/tidspbridge/rmgr/pwr.c b/drivers/staging/tidspbridge/rmgr/pwr.c
index 4f5e498..43c91d4 100644
--- a/drivers/staging/tidspbridge/rmgr/pwr.c
+++ b/drivers/staging/tidspbridge/rmgr/pwr.c
@@ -36,7 +36,7 @@
  *  ======== pwr_sleep_dsp ========
  *    Send command to DSP to enter sleep state.
  */
-int pwr_sleep_dsp(IN const u32 sleepCode, IN const u32 timeout)
+int pwr_sleep_dsp(const u32 sleepCode, const u32 timeout)
 {
 	struct bridge_drv_interface *intf_fxns;
 	struct bridge_dev_context *dw_context;
@@ -79,7 +79,7 @@ int pwr_sleep_dsp(IN const u32 sleepCode, IN const u32 timeout)
  *  ======== pwr_wake_dsp ========
  *    Send command to DSP to wake it from sleep.
  */
-int pwr_wake_dsp(IN const u32 timeout)
+int pwr_wake_dsp(const u32 timeout)
 {
 	struct bridge_drv_interface *intf_fxns;
 	struct bridge_dev_context *dw_context;
@@ -112,7 +112,7 @@ int pwr_wake_dsp(IN const u32 timeout)
  *  ======== pwr_pm_pre_scale========
  *    Sends pre-notification message to DSP.
  */
-int pwr_pm_pre_scale(IN u16 voltage_domain, u32 level)
+int pwr_pm_pre_scale(u16 voltage_domain, u32 level)
 {
 	struct bridge_drv_interface *intf_fxns;
 	struct bridge_dev_context *dw_context;
@@ -148,7 +148,7 @@ int pwr_pm_pre_scale(IN u16 voltage_domain, u32 level)
  *  ======== pwr_pm_post_scale========
  *    Sends post-notification message to DSP.
  */
-int pwr_pm_post_scale(IN u16 voltage_domain, u32 level)
+int pwr_pm_post_scale(u16 voltage_domain, u32 level)
 {
 	struct bridge_drv_interface *intf_fxns;
 	struct bridge_dev_context *dw_context;
diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c
index d31422d..46149da 100644
--- a/drivers/staging/tidspbridge/rmgr/strm.c
+++ b/drivers/staging/tidspbridge/rmgr/strm.c
@@ -419,7 +419,7 @@ bool strm_init(void)
  *  Purpose:
  *      Issues a buffer on a stream
  */
-int strm_issue(struct strm_object *hStrm, IN u8 *pbuf, u32 ul_bytes,
+int strm_issue(struct strm_object *hStrm, u8 *pbuf, u32 ul_bytes,
 		      u32 ul_buf_size, u32 dw_arg)
 {
 	struct bridge_drv_interface *intf_fxns;
@@ -464,7 +464,7 @@ int strm_issue(struct strm_object *hStrm, IN u8 *pbuf, u32 ul_bytes,
  *      XDAIS socket node on the DSP.
  */
 int strm_open(struct node_object *hnode, u32 dir, u32 index,
-		     IN struct strm_attr *pattr,
+		     struct strm_attr *pattr,
 		     OUT struct strm_object **phStrm,
 		     struct process_context *pr_ctxt)
 {
@@ -738,7 +738,7 @@ int strm_register_notify(struct strm_object *hStrm, u32 event_mask,
  *  Purpose:
  *      Selects a ready stream.
  */
-int strm_select(IN struct strm_object **strm_tab, u32 nStrms,
+int strm_select(struct strm_object **strm_tab, u32 nStrms,
 		       OUT u32 *pmask, u32 utimeout)
 {
 	u32 index;
-- 
1.6.3.3

[PATCH 09/11] staging: tidspbridge: remove OPTIONAL

[Nishanth Menon]

OPTIONAL modifier makes no sense in linux kernel

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 drivers/staging/tidspbridge/core/chnl_sm.c         |    2 +-
 .../staging/tidspbridge/include/dspbridge/cod.h    |    2 +-
 .../tidspbridge/include/dspbridge/dspchnl.h        |    4 ++--
 .../tidspbridge/include/dspbridge/dspdefs.h        |    4 ++--
 .../staging/tidspbridge/include/dspbridge/node.h   |   12 ++++++------
 .../staging/tidspbridge/include/dspbridge/proc.h   |    2 +-
 drivers/staging/tidspbridge/pmgr/cod.c             |    2 +-
 drivers/staging/tidspbridge/rmgr/dbdcd.c           |   12 ++++++------
 drivers/staging/tidspbridge/rmgr/nldr.c            |    6 +++---
 drivers/staging/tidspbridge/rmgr/node.c            |   12 ++++++------
 drivers/staging/tidspbridge/rmgr/proc.c            |    2 +-
 11 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c
index 25d2450..2189796 100644
--- a/drivers/staging/tidspbridge/core/chnl_sm.c
+++ b/drivers/staging/tidspbridge/core/chnl_sm.c
@@ -91,7 +91,7 @@ static int search_free_channel(struct chnl_mgr *chnl_mgr_obj,
  */
 int bridge_chnl_add_io_req(struct chnl_object *chnl_obj, void *pHostBuf,
 			       u32 byte_size, u32 buf_size,
-			       OPTIONAL u32 dw_dsp_addr, u32 dw_arg)
+			       u32 dw_dsp_addr, u32 dw_arg)
 {
 	int status = 0;
 	struct chnl_object *pchnl = (struct chnl_object *)chnl_obj;
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h
index cb9b2c3..25817fc 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cod.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h
@@ -93,7 +93,7 @@ extern void cod_close(struct cod_libraryobj *lib);
  */
 extern int cod_create(OUT struct cod_manager **phManager,
 			     char *pstrZLFile,
-			     OPTIONAL const struct cod_attrs *attrs);
+			     const struct cod_attrs *attrs);
 
 /*
  *  ======== cod_delete ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h b/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
index ee71e9b..8b943cc 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
@@ -35,7 +35,7 @@ extern int bridge_chnl_open(OUT struct chnl_object **phChnl,
 				   struct chnl_mgr *hchnl_mgr,
 				   s8 chnl_mode,
 				   u32 uChnlId,
-				   const OPTIONAL struct chnl_attr
+				   const struct chnl_attr
 				   *pattrs);
 
 extern int bridge_chnl_close(struct chnl_object *chnl_obj);
@@ -43,7 +43,7 @@ extern int bridge_chnl_close(struct chnl_object *chnl_obj);
 extern int bridge_chnl_add_io_req(struct chnl_object *chnl_obj,
 				      void *pHostBuf,
 				      u32 byte_size, u32 buf_size,
-				      OPTIONAL u32 dw_dsp_addr, u32 dw_arg);
+				      u32 dw_dsp_addr, u32 dw_arg);
 
 extern int bridge_chnl_get_ioc(struct chnl_object *chnl_obj,
 				   u32 dwTimeOut, OUT struct chnl_ioc *pIOC);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
index 7c86e7b..467ec8b 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
@@ -411,7 +411,7 @@ typedef int(*fxn_chnl_open) (OUT struct chnl_object
 				    struct chnl_mgr *hchnl_mgr,
 				    s8 chnl_mode,
 				    u32 uChnlId,
-				    const OPTIONAL struct
+				    const struct
 				    chnl_attr * pattrs);
 
 /*
@@ -474,7 +474,7 @@ typedef int(*fxn_chnl_addioreq) (struct chnl_object
 					void *pHostBuf,
 					u32 byte_size,
 					u32 buf_size,
-					OPTIONAL u32 dw_dsp_addr, u32 dw_arg);
+					u32 dw_dsp_addr, u32 dw_arg);
 
 /*
  *  ======== bridge_chnl_get_ioc ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/node.h b/drivers/staging/tidspbridge/include/dspbridge/node.h
index 7f16f6f..7be6dda 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/node.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/node.h
@@ -57,8 +57,8 @@
  */
 extern int node_allocate(struct proc_object *hprocessor,
 				const struct dsp_uuid *pNodeId,
-				OPTIONAL const struct dsp_cbdata
-				*pargs, OPTIONAL const struct dsp_nodeattrin
+				const struct dsp_cbdata
+				*pargs, const struct dsp_nodeattrin
 				*attr_in,
 				OUT struct node_object **ph_node,
 				struct process_context *pr_ctxt);
@@ -86,7 +86,7 @@ extern int node_allocate(struct proc_object *hprocessor,
  *  Ensures:
  */
 extern int node_alloc_msg_buf(struct node_object *hnode,
-				     u32 usize, OPTIONAL struct dsp_bufferattr
+				     u32 usize, struct dsp_bufferattr
 				     *pattr, OUT u8 **pbuffer);
 
 /*
@@ -182,8 +182,8 @@ extern int node_connect(struct node_object *hNode1,
 			       u32 uStream1,
 			       struct node_object *hNode2,
 			       u32 uStream2,
-			       OPTIONAL struct dsp_strmattr *pattrs,
-			       OPTIONAL struct dsp_cbdata
+			       struct dsp_strmattr *pattrs,
+			       struct dsp_cbdata
 			       *conn_param);
 
 /*
@@ -335,7 +335,7 @@ extern void node_exit(void);
  */
 extern int node_free_msg_buf(struct node_object *hnode,
 				    u8 *pbuffer,
-				    OPTIONAL struct dsp_bufferattr
+				    struct dsp_bufferattr
 				    *pattr);
 
 /*
diff --git a/drivers/staging/tidspbridge/include/dspbridge/proc.h b/drivers/staging/tidspbridge/include/dspbridge/proc.h
index a06ddc4..12f2f2a 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/proc.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/proc.h
@@ -52,7 +52,7 @@ extern char *iva_img;
  *      When attr_in is NULL, the default timeout value is 10 seconds.
  */
 extern int proc_attach(u32 processor_id,
-			      OPTIONAL const struct dsp_processorattrin
+			      const struct dsp_processorattrin
 			      *attr_in, void **ph_processor,
 			      struct process_context *pr_ctxt);
 
diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c
index 859c2ff..2aed7a4 100644
--- a/drivers/staging/tidspbridge/pmgr/cod.c
+++ b/drivers/staging/tidspbridge/pmgr/cod.c
@@ -217,7 +217,7 @@ void cod_close(struct cod_libraryobj *lib)
  *
  */
 int cod_create(OUT struct cod_manager **phMgr, char *pstrDummyFile,
-		      OPTIONAL const struct cod_attrs *attrs)
+		      const struct cod_attrs *attrs)
 {
 	struct cod_manager *mgr_new;
 	struct dbll_attrs zl_attrs;
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c
index 61c47b0..81b91b8 100644
--- a/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -70,9 +70,9 @@ static char dsp_char2_gpp_char(char *pWord, s32 dsp_char_size);
 static int get_dep_lib_info(struct dcd_manager *hdcd_mgr,
 				   struct dsp_uuid *uuid_obj,
 				   OUT u16 *pNumLibs,
-				   OPTIONAL OUT u16 *pNumPersLibs,
-				   OPTIONAL OUT struct dsp_uuid *pDepLibUuids,
-				   OPTIONAL OUT bool *pPersistentDepLibs,
+				   OUT u16 *pNumPersLibs,
+				   OUT struct dsp_uuid *pDepLibUuids,
+				   OUT bool *pPersistentDepLibs,
 				   enum nldr_phase phase);
 
 /*
@@ -1392,9 +1392,9 @@ static char dsp_char2_gpp_char(char *pWord, s32 dsp_char_size)
 static int get_dep_lib_info(struct dcd_manager *hdcd_mgr,
 				   struct dsp_uuid *uuid_obj,
 				   OUT u16 *pNumLibs,
-				   OPTIONAL OUT u16 *pNumPersLibs,
-				   OPTIONAL OUT struct dsp_uuid *pDepLibUuids,
-				   OPTIONAL OUT bool *pPersistentDepLibs,
+				   OUT u16 *pNumPersLibs,
+				   OUT struct dsp_uuid *pDepLibUuids,
+				   OUT bool *pPersistentDepLibs,
 				   enum nldr_phase phase)
 {
 	struct dcd_manager *dcd_mgr_obj = hdcd_mgr;
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c
index bad1b8f..aaaab67 100644
--- a/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -306,8 +306,8 @@ static int load_lib(struct nldr_nodeobject *nldr_node_obj,
 static int load_ovly(struct nldr_nodeobject *nldr_node_obj,
 			    enum nldr_phase phase);
 static int remote_alloc(void **pRef, u16 mem_sect_type, u32 size,
-			       u32 align, u32 *dspAddr, OPTIONAL s32 segmentId,
-			       OPTIONAL s32 req, bool reserve);
+			       u32 align, u32 *dspAddr, s32 segmentId,
+			       s32 req, bool reserve);
 static int remote_free(void **pRef, u16 space, u32 dspAddr, u32 size,
 			      bool reserve);
 
@@ -1625,7 +1625,7 @@ func_end:
  */
 static int remote_alloc(void **pRef, u16 space, u32 size,
 			       u32 align, u32 *dspAddr,
-			       OPTIONAL s32 segmentId, OPTIONAL s32 req,
+			       s32 segmentId, s32 req,
 			       bool reserve)
 {
 	struct nldr_nodeobject *hnode = (struct nldr_nodeobject *)pRef;
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index c19e1bf..1f975c6 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -292,8 +292,8 @@ enum node_state node_get_state(void *hnode)
  */
 int node_allocate(struct proc_object *hprocessor,
 			 const struct dsp_uuid *pNodeId,
-			 OPTIONAL const struct dsp_cbdata *pargs,
-			 OPTIONAL const struct dsp_nodeattrin *attr_in,
+			 const struct dsp_cbdata *pargs,
+			 const struct dsp_nodeattrin *attr_in,
 			 OUT struct node_object **ph_node,
 			 struct process_context *pr_ctxt)
 {
@@ -685,7 +685,7 @@ func_end:
  *      Allocates buffer for zero copy messaging.
  */
 DBAPI node_alloc_msg_buf(struct node_object *hnode, u32 usize,
-			 OPTIONAL OUT struct dsp_bufferattr *pattr,
+			 OUT struct dsp_bufferattr *pattr,
 			 OUT u8 **pbuffer)
 {
 	struct node_object *pnode = (struct node_object *)hnode;
@@ -833,8 +833,8 @@ func_end:
  */
 int node_connect(struct node_object *hNode1, u32 uStream1,
 			struct node_object *hNode2,
-			u32 uStream2, OPTIONAL struct dsp_strmattr *pattrs,
-			OPTIONAL struct dsp_cbdata *conn_param)
+			u32 uStream2, struct dsp_strmattr *pattrs,
+			struct dsp_cbdata *conn_param)
 {
 	struct node_mgr *hnode_mgr;
 	char *pstr_dev_name = NULL;
@@ -1674,7 +1674,7 @@ void node_exit(void)
  *      Frees the message buffer.
  */
 int node_free_msg_buf(struct node_object *hnode, u8 * pbuffer,
-			     OPTIONAL struct dsp_bufferattr *pattr)
+			     struct dsp_bufferattr *pattr)
 {
 	struct node_object *pnode = (struct node_object *)hnode;
 	int status = 0;
diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index e95d44c..1f450fe 100644
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -272,7 +272,7 @@ static inline struct page *get_mapping_page(struct dmm_map_object *map_obj,
  */
 int
 proc_attach(u32 processor_id,
-	    OPTIONAL const struct dsp_processorattrin *attr_in,
+	    const struct dsp_processorattrin *attr_in,
 	    void **ph_processor, struct process_context *pr_ctxt)
 {
 	int status = 0;
-- 
1.6.3.3

[PATCH 10/11] staging: tidspbridge: remove OUT define

[Nishanth Menon]

Remove OUT modifier which makes no sense for linux kernel

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 drivers/staging/tidspbridge/core/chnl_sm.c         |   14 ++++----
 drivers/staging/tidspbridge/core/io_sm.c           |   12 +++---
 drivers/staging/tidspbridge/core/msg_sm.c          |    4 +-
 drivers/staging/tidspbridge/core/tiomap3430.c      |   14 ++++----
 drivers/staging/tidspbridge/core/tiomap_io.c       |    2 +-
 drivers/staging/tidspbridge/core/tiomap_io.h       |    4 +-
 drivers/staging/tidspbridge/gen/uuidutil.c         |    4 +-
 .../staging/tidspbridge/include/dspbridge/cfg.h    |   14 ++++----
 .../staging/tidspbridge/include/dspbridge/chnl.h   |    2 +-
 .../staging/tidspbridge/include/dspbridge/cmm.h    |   12 +++---
 .../staging/tidspbridge/include/dspbridge/cod.h    |   10 +++---
 .../staging/tidspbridge/include/dspbridge/dbdcd.h  |   20 ++++++------
 .../staging/tidspbridge/include/dspbridge/dev.h    |   30 +++++++++---------
 .../staging/tidspbridge/include/dspbridge/disp.h   |    4 +-
 .../staging/tidspbridge/include/dspbridge/dmm.h    |    4 +-
 .../staging/tidspbridge/include/dspbridge/drv.h    |    4 +-
 .../tidspbridge/include/dspbridge/dspapi-ioctl.h   |    2 +-
 .../tidspbridge/include/dspbridge/dspchnl.h        |   10 +++---
 .../tidspbridge/include/dspbridge/dspdefs.h        |   24 +++++++-------
 .../staging/tidspbridge/include/dspbridge/dspdrv.h |    2 +-
 .../staging/tidspbridge/include/dspbridge/dspio.h  |    4 +-
 .../staging/tidspbridge/include/dspbridge/dspmsg.h |    4 +-
 drivers/staging/tidspbridge/include/dspbridge/io.h |    2 +-
 .../staging/tidspbridge/include/dspbridge/io_sm.h  |    8 ++--
 .../staging/tidspbridge/include/dspbridge/mgr.h    |   14 ++++----
 .../staging/tidspbridge/include/dspbridge/msg.h    |    2 +-
 .../staging/tidspbridge/include/dspbridge/nldr.h   |    6 ++--
 .../tidspbridge/include/dspbridge/nldrdefs.h       |    6 ++--
 .../staging/tidspbridge/include/dspbridge/node.h   |   20 ++++++------
 .../tidspbridge/include/dspbridge/nodepriv.h       |    2 +-
 .../staging/tidspbridge/include/dspbridge/proc.h   |    8 ++--
 .../staging/tidspbridge/include/dspbridge/strm.h   |   14 ++++----
 .../tidspbridge/include/dspbridge/uuidutil.h       |    4 +-
 drivers/staging/tidspbridge/pmgr/chnl.c            |    2 +-
 drivers/staging/tidspbridge/pmgr/cmm.c             |   12 +++---
 drivers/staging/tidspbridge/pmgr/cod.c             |    6 ++--
 drivers/staging/tidspbridge/pmgr/dev.c             |   34 ++++++++++----------
 drivers/staging/tidspbridge/pmgr/dmm.c             |    4 +-
 drivers/staging/tidspbridge/pmgr/dspapi.c          |    2 +-
 drivers/staging/tidspbridge/pmgr/io.c              |    2 +-
 drivers/staging/tidspbridge/pmgr/msg.c             |    2 +-
 drivers/staging/tidspbridge/rmgr/dbdcd.c           |   32 +++++++++---------
 drivers/staging/tidspbridge/rmgr/disp.c            |    6 ++--
 drivers/staging/tidspbridge/rmgr/drv.c             |    6 ++--
 drivers/staging/tidspbridge/rmgr/dspdrv.c          |    2 +-
 drivers/staging/tidspbridge/rmgr/mgr.c             |   14 ++++----
 drivers/staging/tidspbridge/rmgr/nldr.c            |    6 ++--
 drivers/staging/tidspbridge/rmgr/node.c            |   22 ++++++------
 drivers/staging/tidspbridge/rmgr/proc.c            |    8 ++--
 drivers/staging/tidspbridge/rmgr/strm.c            |   12 +++---
 drivers/staging/tidspbridge/services/cfg.c         |    8 ++--
 51 files changed, 233 insertions(+), 233 deletions(-)

diff --git a/drivers/staging/tidspbridge/core/chnl_sm.c b/drivers/staging/tidspbridge/core/chnl_sm.c
index 2189796..efc167a 100644
--- a/drivers/staging/tidspbridge/core/chnl_sm.c
+++ b/drivers/staging/tidspbridge/core/chnl_sm.c
@@ -81,7 +81,7 @@ static void free_chirp_list(struct lst_list *pList);
 static struct chnl_irp *make_new_chirp(void);
 
 static int search_free_channel(struct chnl_mgr *chnl_mgr_obj,
-				      OUT u32 *pdwChnl);
+				      u32 *pdwChnl);
 
 /*
  *  ======== bridge_chnl_add_io_req ========
@@ -381,7 +381,7 @@ func_cont:
  *      Create a channel manager object, responsible for opening new channels
  *      and closing old ones for a given board.
  */
-int bridge_chnl_create(OUT struct chnl_mgr **phChnlMgr,
+int bridge_chnl_create(struct chnl_mgr **phChnlMgr,
 			      struct dev_object *hdev_obj,
 			      const struct chnl_mgrattrs *pMgrAttrs)
 {
@@ -534,7 +534,7 @@ int bridge_chnl_flush_io(struct chnl_object *chnl_obj, u32 dwTimeOut)
  *      Retrieve information related to a channel.
  */
 int bridge_chnl_get_info(struct chnl_object *chnl_obj,
-			     OUT struct chnl_info *pInfo)
+			     struct chnl_info *pInfo)
 {
 	int status = 0;
 	struct chnl_object *pchnl = (struct chnl_object *)chnl_obj;
@@ -568,7 +568,7 @@ int bridge_chnl_get_info(struct chnl_object *chnl_obj,
  *      Note: Ensures Channel Invariant (see notes above).
  */
 int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 dwTimeOut,
-			    OUT struct chnl_ioc *pIOC)
+			    struct chnl_ioc *pIOC)
 {
 	int status = 0;
 	struct chnl_object *pchnl = (struct chnl_object *)chnl_obj;
@@ -711,7 +711,7 @@ func_end:
  *      Retrieve information related to the channel manager.
  */
 int bridge_chnl_get_mgr_info(struct chnl_mgr *hchnl_mgr, u32 uChnlID,
-				 OUT struct chnl_mgrinfo *pMgrInfo)
+				 struct chnl_mgrinfo *pMgrInfo)
 {
 	int status = 0;
 	struct chnl_mgr *chnl_mgr_obj = (struct chnl_mgr *)hchnl_mgr;
@@ -775,7 +775,7 @@ int bridge_chnl_idle(struct chnl_object *chnl_obj, u32 dwTimeOut,
  *  ======== bridge_chnl_open ========
  *      Open a new half-duplex channel to the DSP board.
  */
-int bridge_chnl_open(OUT struct chnl_object **phChnl,
+int bridge_chnl_open(struct chnl_object **phChnl,
 			    struct chnl_mgr *hchnl_mgr, s8 chnl_mode,
 			    u32 uChnlId, const struct chnl_attr *pattrs)
 {
@@ -997,7 +997,7 @@ static struct chnl_irp *make_new_chirp(void)
  *      Search for a free channel slot in the array of channel pointers.
  */
 static int search_free_channel(struct chnl_mgr *chnl_mgr_obj,
-				      OUT u32 *pdwChnl)
+				      u32 *pdwChnl)
 {
 	int status = -ENOSR;
 	u32 i;
diff --git a/drivers/staging/tidspbridge/core/io_sm.c b/drivers/staging/tidspbridge/core/io_sm.c
index 87e59ca..4552c3e 100644
--- a/drivers/staging/tidspbridge/core/io_sm.c
+++ b/drivers/staging/tidspbridge/core/io_sm.c
@@ -133,7 +133,7 @@ struct io_mgr {
 
 /* Function Prototypes */
 static void io_dispatch_chnl(struct io_mgr *pio_mgr,
-				OUT struct chnl_object *pchnl, u8 iMode);
+				struct chnl_object *pchnl, u8 iMode);
 static void io_dispatch_msg(struct io_mgr *pio_mgr,
 			    struct msg_mgr *hmsg_mgr);
 static void io_dispatch_pm(struct io_mgr *pio_mgr);
@@ -161,7 +161,7 @@ static int register_shm_segs(struct io_mgr *hio_mgr,
  *  ======== bridge_io_create ========
  *      Create an IO manager object.
  */
-int bridge_io_create(OUT struct io_mgr **phIOMgr,
+int bridge_io_create(struct io_mgr **phIOMgr,
 			    struct dev_object *hdev_obj,
 			    const struct io_attrs *pMgrAttrs)
 {
@@ -839,7 +839,7 @@ func_end:
  *      Proc-copy chanl dispatch.
  */
 static void io_dispatch_chnl(struct io_mgr *pio_mgr,
-				OUT struct chnl_object *pchnl, u8 iMode)
+				struct chnl_object *pchnl, u8 iMode)
 {
 	if (!pio_mgr)
 		goto func_end;
@@ -919,7 +919,7 @@ static void io_dispatch_pm(struct io_mgr *pio_mgr)
  *      out the dispatch of I/O as a non-preemptible event.It can only be
  *      pre-empted      by an ISR.
  */
-void io_dpc(OUT unsigned long pRefData)
+void io_dpc(unsigned long pRefData)
 {
 	struct io_mgr *pio_mgr = (struct io_mgr *)pRefData;
 	struct chnl_mgr *chnl_mgr_obj;
@@ -1014,7 +1014,7 @@ void io_mbox_msg(u32 msg)
  *      interrupts the DSP.
  */
 void io_request_chnl(struct io_mgr *pio_mgr, struct chnl_object *pchnl,
-			u8 iMode, OUT u16 *pwMbVal)
+			u8 iMode, u16 *pwMbVal)
 {
 	struct chnl_mgr *chnl_mgr_obj;
 	struct shm *sm;
@@ -1793,7 +1793,7 @@ int io_sh_msetting(struct io_mgr *hio_mgr, u8 desc, void *pargs)
  *      Gets the Processor's Load information
  */
 int bridge_io_get_proc_load(struct io_mgr *hio_mgr,
-				OUT struct dsp_procloadstat *pProcStat)
+				struct dsp_procloadstat *pProcStat)
 {
 	pProcStat->curr_load = hio_mgr->shared_mem->load_mon_info.curr_dsp_load;
 	pProcStat->predicted_load =
diff --git a/drivers/staging/tidspbridge/core/msg_sm.c b/drivers/staging/tidspbridge/core/msg_sm.c
index 7fd85ce..d9c2e76 100644
--- a/drivers/staging/tidspbridge/core/msg_sm.c
+++ b/drivers/staging/tidspbridge/core/msg_sm.c
@@ -48,7 +48,7 @@ static void free_msg_list(struct lst_list *msgList);
  *      Create an object to manage message queues. Only one of these objects
  *      can exist per device object.
  */
-int bridge_msg_create(OUT struct msg_mgr **phMsgMgr,
+int bridge_msg_create(struct msg_mgr **phMsgMgr,
 			     struct dev_object *hdev_obj,
 			     msg_onexit msgCallback)
 {
@@ -120,7 +120,7 @@ func_end:
  *      on the DSP.
  */
 int bridge_msg_create_queue(struct msg_mgr *hmsg_mgr,
-				OUT struct msg_queue **phMsgQueue,
+				struct msg_queue **phMsgQueue,
 				u32 msgq_id, u32 max_msgs, void *arg)
 {
 	u32 i;
diff --git a/drivers/staging/tidspbridge/core/tiomap3430.c b/drivers/staging/tidspbridge/core/tiomap3430.c
index 3731fd0..aa94f3a 100644
--- a/drivers/staging/tidspbridge/core/tiomap3430.c
+++ b/drivers/staging/tidspbridge/core/tiomap3430.c
@@ -76,7 +76,7 @@
 /* Forward Declarations: */
 static int bridge_brd_monitor(struct bridge_dev_context *dev_context);
 static int bridge_brd_read(struct bridge_dev_context *dev_context,
-				  OUT u8 *pbHostBuf,
+				  u8 *pbHostBuf,
 				  u32 dwDSPAddr, u32 ul_num_bytes,
 				  u32 ulMemType);
 static int bridge_brd_start(struct bridge_dev_context *dev_context,
@@ -102,12 +102,12 @@ static int bridge_brd_mem_map(struct bridge_dev_context *hDevContext,
 				  struct page **mapped_pages);
 static int bridge_brd_mem_un_map(struct bridge_dev_context *hDevContext,
 				     u32 ulVirtAddr, u32 ul_num_bytes);
-static int bridge_dev_create(OUT struct bridge_dev_context
+static int bridge_dev_create(struct bridge_dev_context
 					**ppDevContext,
 					struct dev_object *hdev_obj,
 					struct cfg_hostres *pConfig);
 static int bridge_dev_ctrl(struct bridge_dev_context *dev_context,
-				  u32 dw_cmd, OUT void *pargs);
+				  u32 dw_cmd, void *pargs);
 static int bridge_dev_destroy(struct bridge_dev_context *dev_context);
 static u32 user_va2_pa(struct mm_struct *mm, u32 address);
 static int pte_update(struct bridge_dev_context *hDevContext, u32 pa,
@@ -236,7 +236,7 @@ static void bad_page_dump(u32 pa, struct page *pg)
  *  purpose:
  *      Bridge Driver entry point.
  */
-void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
+void bridge_drv_entry(struct bridge_drv_interface **ppDrvInterface,
 		   const char *driver_file_name)
 {
 
@@ -304,7 +304,7 @@ static int bridge_brd_monitor(struct bridge_dev_context *hDevContext)
  *      Reads buffers for DSP memory.
  */
 static int bridge_brd_read(struct bridge_dev_context *hDevContext,
-				  OUT u8 *pbHostBuf, u32 dwDSPAddr,
+				  u8 *pbHostBuf, u32 dwDSPAddr,
 				  u32 ul_num_bytes, u32 ulMemType)
 {
 	int status = 0;
@@ -785,7 +785,7 @@ static int bridge_brd_write(struct bridge_dev_context *hDevContext,
  *  ======== bridge_dev_create ========
  *      Creates a driver object. Puts DSP in self loop.
  */
-static int bridge_dev_create(OUT struct bridge_dev_context
+static int bridge_dev_create(struct bridge_dev_context
 					**ppDevContext,
 					struct dev_object *hdev_obj,
 					struct cfg_hostres *pConfig)
@@ -954,7 +954,7 @@ func_end:
  *      Receives device specific commands.
  */
 static int bridge_dev_ctrl(struct bridge_dev_context *dev_context,
-				  u32 dw_cmd, OUT void *pargs)
+				  u32 dw_cmd, void *pargs)
 {
 	int status = 0;
 	struct bridge_ioctl_extproc *pa_ext_proc =
diff --git a/drivers/staging/tidspbridge/core/tiomap_io.c b/drivers/staging/tidspbridge/core/tiomap_io.c
index b2d516b..4a43927 100644
--- a/drivers/staging/tidspbridge/core/tiomap_io.c
+++ b/drivers/staging/tidspbridge/core/tiomap_io.c
@@ -51,7 +51,7 @@ bool symbols_reloaded = true;
  *      Copies DSP external memory buffers to the host side buffers.
  */
 int read_ext_dsp_data(struct bridge_dev_context *hDevContext,
-			     OUT u8 *pbHostBuf, u32 dwDSPAddr,
+			     u8 *pbHostBuf, u32 dwDSPAddr,
 			     u32 ul_num_bytes, u32 ulMemType)
 {
 	int status = 0;
diff --git a/drivers/staging/tidspbridge/core/tiomap_io.h b/drivers/staging/tidspbridge/core/tiomap_io.h
index 243636d..eb08f1b 100644
--- a/drivers/staging/tidspbridge/core/tiomap_io.h
+++ b/drivers/staging/tidspbridge/core/tiomap_io.h
@@ -48,14 +48,14 @@
  * is configured by the combination of DSP MMU and shm Memory manager in the CDB
  */
 extern int read_ext_dsp_data(struct bridge_dev_context *dev_context,
-				    OUT u8 *pbHostBuf, u32 dwDSPAddr,
+				    u8 *pbHostBuf, u32 dwDSPAddr,
 				    u32 ul_num_bytes, u32 ulMemType);
 
 /*
  *  ======== write_dsp_data ========
  */
 extern int write_dsp_data(struct bridge_dev_context *dev_context,
-				 OUT u8 *pbHostBuf, u32 dwDSPAddr,
+				 u8 *pbHostBuf, u32 dwDSPAddr,
 				 u32 ul_num_bytes, u32 ulMemType);
 
 /*
diff --git a/drivers/staging/tidspbridge/gen/uuidutil.c b/drivers/staging/tidspbridge/gen/uuidutil.c
index 17434b6..e13bbf2 100644
--- a/drivers/staging/tidspbridge/gen/uuidutil.c
+++ b/drivers/staging/tidspbridge/gen/uuidutil.c
@@ -36,7 +36,7 @@
  *      Note: snprintf format specifier is:
  *      %[flags] [width] [.precision] [{h | l | I64 | L}]type
  */
-void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, OUT char *pszUuid,
+void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, char *pszUuid,
 			 s32 size)
 {
 	s32 i;			/* return result from snprintf. */
@@ -75,7 +75,7 @@ static s32 uuid_hex_to_bin(char *buf, s32 len)
  *  Purpose:
  *      Converts a string to a struct dsp_uuid.
  */
-void uuid_uuid_from_string(char *pszUuid, OUT struct dsp_uuid *uuid_obj)
+void uuid_uuid_from_string(char *pszUuid, struct dsp_uuid *uuid_obj)
 {
 	s32 j;
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cfg.h b/drivers/staging/tidspbridge/include/dspbridge/cfg.h
index 0e7961d..bdf7b37 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cfg.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cfg.h
@@ -51,7 +51,7 @@ extern void cfg_exit(void);
  *      0:        *pdwAutoStart contains autostart mask for this devnode.
  */
 extern int cfg_get_auto_start(struct cfg_devnode *dev_node_obj,
-				     OUT u32 *pdwAutoStart);
+				     u32 *pdwAutoStart);
 
 /*
  *  ======== cfg_get_cd_version ========
@@ -70,7 +70,7 @@ extern int cfg_get_auto_start(struct cfg_devnode *dev_node_obj,
  *      0:    Success.
  *      else:       *pdwVersion is NULL.
  */
-extern int cfg_get_cd_version(OUT u32 *pdwVersion);
+extern int cfg_get_cd_version(u32 *pdwVersion);
 
 /*
  *  ======== cfg_get_dev_object ========
@@ -91,7 +91,7 @@ extern int cfg_get_cd_version(OUT u32 *pdwVersion);
  *      else:       *pdwValue is set to 0L.
  */
 extern int cfg_get_dev_object(struct cfg_devnode *dev_node_obj,
-				     OUT u32 *pdwValue);
+				     u32 *pdwValue);
 
 /*
  *  ======== cfg_get_exec_file ========
@@ -113,7 +113,7 @@ extern int cfg_get_dev_object(struct cfg_devnode *dev_node_obj,
  *                  devnode.
  */
 extern int cfg_get_exec_file(struct cfg_devnode *dev_node_obj,
-				    u32 buf_size, OUT char *pstrExecFile);
+				    u32 buf_size, char *pstrExecFile);
 
 /*
  *  ======== cfg_get_object ========
@@ -130,7 +130,7 @@ extern int cfg_get_exec_file(struct cfg_devnode *dev_node_obj,
  *      0:    *pdwValue is set to the retrieved u32(non-Zero).
  *      else:       *pdwValue is set to 0L.
  */
-extern int cfg_get_object(OUT u32 *pdwValue, u8 dw_type);
+extern int cfg_get_object(u32 *pdwValue, u8 dw_type);
 
 /*
  *  ======== cfg_get_perf_value ========
@@ -146,7 +146,7 @@ extern int cfg_get_object(OUT u32 *pdwValue, u8 dw_type);
  *      pfEnablePerf != NULL;
  *  Ensures:
  */
-extern void cfg_get_perf_value(OUT bool *pfEnablePerf);
+extern void cfg_get_perf_value(bool *pfEnablePerf);
 
 /*
  *  ======== cfg_get_zl_file ========
@@ -168,7 +168,7 @@ extern void cfg_get_perf_value(OUT bool *pfEnablePerf);
  *                  for this devnode.
  */
 extern int cfg_get_zl_file(struct cfg_devnode *dev_node_obj,
-				  u32 buf_size, OUT char *pstrZLFileName);
+				  u32 buf_size, char *pstrZLFileName);
 
 /*
  *  ======== cfg_init ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/chnl.h b/drivers/staging/tidspbridge/include/dspbridge/chnl.h
index aa6cd77..2b49b76 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/chnl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/chnl.h
@@ -77,7 +77,7 @@ extern int chnl_close(struct chnl_object *chnl_obj);
  *                              board without an intervening call to
  *                              chnl_destroy() will fail.
  */
-extern int chnl_create(OUT struct chnl_mgr **phChnlMgr,
+extern int chnl_create(struct chnl_mgr **phChnlMgr,
 			      struct dev_object *hdev_obj,
 			      const struct chnl_mgrattrs *pMgrAttrs);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cmm.h b/drivers/staging/tidspbridge/include/dspbridge/cmm.h
index 70e9dc5..8bae008 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cmm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cmm.h
@@ -62,7 +62,7 @@
  */
 extern void *cmm_calloc_buf(struct cmm_object *hcmm_mgr,
 			    u32 usize, struct cmm_attrs *pattrs,
-			    OUT void **pp_buf_va);
+			    void **pp_buf_va);
 
 /*
  *  ======== cmm_create ========
@@ -85,7 +85,7 @@ extern void *cmm_calloc_buf(struct cmm_object *hcmm_mgr,
  *  Ensures:
  *
  */
-extern int cmm_create(OUT struct cmm_object **ph_cmm_mgr,
+extern int cmm_create(struct cmm_object **ph_cmm_mgr,
 			     struct dev_object *hdev_obj,
 			     const struct cmm_mgrattrs *pMgrAttrs);
 
@@ -163,7 +163,7 @@ extern int cmm_free_buf(struct cmm_object *hcmm_mgr,
  *  Ensures:
  */
 extern int cmm_get_handle(void *hprocessor,
-				 OUT struct cmm_object **ph_cmm_mgr);
+				 struct cmm_object **ph_cmm_mgr);
 
 /*
  *  ======== cmm_get_info ========
@@ -182,7 +182,7 @@ extern int cmm_get_handle(void *hprocessor,
  *
  */
 extern int cmm_get_info(struct cmm_object *hcmm_mgr,
-			       OUT struct cmm_info *cmm_info_obj);
+			       struct cmm_info *cmm_info_obj);
 
 /*
  *  ======== cmm_init ========
@@ -295,7 +295,7 @@ extern void *cmm_xlator_alloc_buf(struct cmm_xlatorobject *xlator,
  *  Ensures:
  *
  */
-extern int cmm_xlator_create(OUT struct cmm_xlatorobject **phXlator,
+extern int cmm_xlator_create(struct cmm_xlatorobject **phXlator,
 				    struct cmm_object *hcmm_mgr,
 				    struct cmm_xlatorattrs *pXlatorAttrs);
 
@@ -359,7 +359,7 @@ extern int cmm_xlator_free_buf(struct cmm_xlatorobject *xlator,
  *
  */
 extern int cmm_xlator_info(struct cmm_xlatorobject *xlator,
-				  OUT u8 **paddr,
+				  u8 **paddr,
 				  u32 ul_size, u32 uSegId, bool set_info);
 
 /*
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h
index 25817fc..3850de2 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cod.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h
@@ -91,7 +91,7 @@ extern void cod_close(struct cod_libraryobj *lib);
  *      pstrZLFile != NULL
  *  Ensures:
  */
-extern int cod_create(OUT struct cod_manager **phManager,
+extern int cod_create(struct cod_manager **phManager,
 			     char *pstrZLFile,
 			     const struct cod_attrs *attrs);
 
@@ -227,7 +227,7 @@ extern int cod_get_loader(struct cod_manager *cod_mgr_obj,
  */
 extern int cod_get_section(struct cod_libraryobj *lib,
 				  char *pstrSect,
-				  OUT u32 *puAddr, OUT u32 *puLen);
+				  u32 *puAddr, u32 *puLen);
 
 /*
  *  ======== cod_get_sym_value ========
@@ -251,7 +251,7 @@ extern int cod_get_section(struct cod_libraryobj *lib,
  *  Ensures:
  */
 extern int cod_get_sym_value(struct cod_manager *cod_mgr_obj,
-				    char *pstrSym, OUT u32 * pul_value);
+				    char *pstrSym, u32 * pul_value);
 
 /*
  *  ======== cod_init ========
@@ -321,7 +321,7 @@ extern int cod_load_base(struct cod_manager *cod_mgr_obj,
  */
 extern int cod_open(struct cod_manager *hmgr,
 			   char *pszCoffPath,
-			   u32 flags, OUT struct cod_libraryobj **pLib);
+			   u32 flags, struct cod_libraryobj **pLib);
 
 /*
  *  ======== cod_open_base ========
@@ -364,6 +364,6 @@ extern int cod_open_base(struct cod_manager *hmgr, char *pszCoffPath,
  */
 extern int cod_read_section(struct cod_libraryobj *lib,
 				   char *pstrSect,
-				   OUT char *pstrContent, u32 content_size);
+				   char *pstrContent, u32 content_size);
 
 #endif /* COD_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h b/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
index 6d32e02..61a01a6 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
@@ -90,7 +90,7 @@ extern int dcd_auto_unregister(struct dcd_manager *hdcd_mgr,
  *      A DCD manager handle is created.
  */
 extern int dcd_create_manager(char *pszZlDllName,
-				     OUT struct dcd_manager **phDcdMgr);
+				     struct dcd_manager **phDcdMgr);
 
 /*
  *  ======== dcd_destroy_manager ========
@@ -130,7 +130,7 @@ extern int dcd_destroy_manager(struct dcd_manager *hdcd_mgr);
  */
 extern int dcd_enumerate_object(s32 index,
 				       enum dsp_dcdobjtype obj_type,
-				       OUT struct dsp_uuid *uuid_obj);
+				       struct dsp_uuid *uuid_obj);
 
 /*
  *  ======== dcd_exit ========
@@ -172,8 +172,8 @@ extern void dcd_exit(void);
 extern int dcd_get_dep_libs(struct dcd_manager *hdcd_mgr,
 				   struct dsp_uuid *uuid_obj,
 				   u16 numLibs,
-				   OUT struct dsp_uuid *pDepLibUuids,
-				   OUT bool *pPersistentDepLibs,
+				   struct dsp_uuid *pDepLibUuids,
+				   bool *pPersistentDepLibs,
 				   enum nldr_phase phase);
 
 /*
@@ -201,8 +201,8 @@ extern int dcd_get_dep_libs(struct dcd_manager *hdcd_mgr,
  */
 extern int dcd_get_num_dep_libs(struct dcd_manager *hdcd_mgr,
 				       struct dsp_uuid *uuid_obj,
-				       OUT u16 *pNumLibs,
-				       OUT u16 *pNumPersLibs,
+				       u16 *pNumLibs,
+				       u16 *pNumPersLibs,
 				       enum nldr_phase phase);
 
 /*
@@ -231,10 +231,10 @@ extern int dcd_get_num_dep_libs(struct dcd_manager *hdcd_mgr,
  */
 extern int dcd_get_library_name(struct dcd_manager *hdcd_mgr,
 				       struct dsp_uuid *uuid_obj,
-				       OUT char *pstrLibName,
-				       OUT u32 *pdwSize,
+				       char *pstrLibName,
+				       u32 *pdwSize,
 				       enum nldr_phase phase,
-				       OUT bool *phase_split);
+				       bool *phase_split);
 
 /*
  *  ======== dcd_get_object_def ========
@@ -264,7 +264,7 @@ extern int dcd_get_library_name(struct dcd_manager *hdcd_mgr,
 extern int dcd_get_object_def(struct dcd_manager *hdcd_mgr,
 				     struct dsp_uuid *pObjUuid,
 				     enum dsp_dcdobjtype obj_type,
-				     OUT struct dcd_genericobj *pObjDef);
+				     struct dcd_genericobj *pObjDef);
 
 /*
  *  ======== dcd_get_objects ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h
index 4c0658d..664f66b 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dev.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h
@@ -89,7 +89,7 @@ extern u32 dev_brd_write_fxn(void *pArb,
  *      Otherwise, does not create the device object, ensures the Bridge driver
  *      module is unloaded, and sets *phDevObject to NULL.
  */
-extern int dev_create_device(OUT struct dev_object
+extern int dev_create_device(struct dev_object
 				    **phDevObject,
 				    const char *driver_file_name,
 				    struct cfg_devnode *dev_node_obj);
@@ -124,7 +124,7 @@ extern int dev_create_device(OUT struct dev_object
  *      Otherwise, does not create the device object, ensures the Bridge driver
  *      module is unloaded, and sets *phDevObject to NULL.
  */
-extern int dev_create_iva_device(OUT struct dev_object
+extern int dev_create_iva_device(struct dev_object
 					**phDevObject,
 					const char *driver_file_name,
 					const struct cfg_hostres
@@ -208,7 +208,7 @@ extern int dev_destroy_device(struct dev_object
  *      else:           *phMgr is NULL.
  */
 extern int dev_get_chnl_mgr(struct dev_object *hdev_obj,
-				   OUT struct chnl_mgr **phMgr);
+				   struct chnl_mgr **phMgr);
 
 /*
  *  ======== dev_get_cmm_mgr ========
@@ -231,7 +231,7 @@ extern int dev_get_chnl_mgr(struct dev_object *hdev_obj,
  *      else:           *phMgr is NULL.
  */
 extern int dev_get_cmm_mgr(struct dev_object *hdev_obj,
-				  OUT struct cmm_object **phMgr);
+				  struct cmm_object **phMgr);
 
 /*
  *  ======== dev_get_dmm_mgr ========
@@ -254,7 +254,7 @@ extern int dev_get_cmm_mgr(struct dev_object *hdev_obj,
  *      else:           *phMgr is NULL.
  */
 extern int dev_get_dmm_mgr(struct dev_object *hdev_obj,
-				  OUT struct dmm_object **phMgr);
+				  struct dmm_object **phMgr);
 
 /*
  *  ======== dev_get_cod_mgr ========
@@ -275,7 +275,7 @@ extern int dev_get_dmm_mgr(struct dev_object *hdev_obj,
  *      else:           *phCodMgr is NULL.
  */
 extern int dev_get_cod_mgr(struct dev_object *hdev_obj,
-				  OUT struct cod_manager **phCodMgr);
+				  struct cod_manager **phCodMgr);
 
 /*
  *  ======== dev_get_deh_mgr ========
@@ -295,7 +295,7 @@ extern int dev_get_cod_mgr(struct dev_object *hdev_obj,
  *      else:       *phDehMgr is NULL.
  */
 extern int dev_get_deh_mgr(struct dev_object *hdev_obj,
-				  OUT struct deh_mgr **phDehMgr);
+				  struct deh_mgr **phDehMgr);
 
 /*
  *  ======== dev_get_dev_node ========
@@ -316,7 +316,7 @@ extern int dev_get_deh_mgr(struct dev_object *hdev_obj,
  *      else:           *phDevNode is NULL.
  */
 extern int dev_get_dev_node(struct dev_object *hdev_obj,
-				   OUT struct cfg_devnode **phDevNode);
+				   struct cfg_devnode **phDevNode);
 
 /*
  *  ======== dev_get_dev_type ========
@@ -380,7 +380,7 @@ extern struct dev_object *dev_get_first(void);
  *      else:           *ppIntfFxns is NULL.
  */
 extern int dev_get_intf_fxns(struct dev_object *hdev_obj,
-			    OUT struct bridge_drv_interface **ppIntfFxns);
+			    struct bridge_drv_interface **ppIntfFxns);
 
 /*
  *  ======== dev_get_io_mgr ========
@@ -401,7 +401,7 @@ extern int dev_get_intf_fxns(struct dev_object *hdev_obj,
  *      else:           *phMgr is NULL.
  */
 extern int dev_get_io_mgr(struct dev_object *hdev_obj,
-				 OUT struct io_mgr **phMgr);
+				 struct io_mgr **phMgr);
 
 /*
  *  ======== dev_get_next ========
@@ -443,7 +443,7 @@ extern struct dev_object *dev_get_next(struct dev_object
  *  Ensures:
  */
 extern void dev_get_msg_mgr(struct dev_object *hdev_obj,
-			    OUT struct msg_mgr **phMsgMgr);
+			    struct msg_mgr **phMsgMgr);
 
 /*
  *  ========= dev_get_node_manager ========
@@ -466,7 +466,7 @@ extern void dev_get_msg_mgr(struct dev_object *hdev_obj,
  */
 extern int dev_get_node_manager(struct dev_object
 				       *hdev_obj,
-				       OUT struct node_mgr **phNodeMgr);
+				       struct node_mgr **phNodeMgr);
 
 /*
  *  ======== dev_get_symbol ========
@@ -490,7 +490,7 @@ extern int dev_get_node_manager(struct dev_object
  *      0:        *pul_value contains the symbol value;
  */
 extern int dev_get_symbol(struct dev_object *hdev_obj,
-				 const char *pstrSym, OUT u32 * pul_value);
+				 const char *pstrSym, u32 * pul_value);
 
 /*
  *  ======== dev_get_bridge_context ========
@@ -511,7 +511,7 @@ extern int dev_get_symbol(struct dev_object *hdev_obj,
  *      else:           *phbridge_context is NULL;
  */
 extern int dev_get_bridge_context(struct dev_object *hdev_obj,
-				      OUT struct bridge_dev_context
+				      struct bridge_dev_context
 				      **phbridge_context);
 
 /*
@@ -585,7 +585,7 @@ extern int dev_is_locked(struct dev_object *hdev_obj);
 extern int dev_insert_proc_object(struct dev_object
 					 *hdev_obj,
 					 u32 proc_obj,
-					 OUT bool *pbAlreadyAttached);
+					 bool *pbAlreadyAttached);
 
 /*
  *  ======== dev_remove_proc_object ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/disp.h b/drivers/staging/tidspbridge/include/dspbridge/disp.h
index abadc79..5a12a88 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/disp.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/disp.h
@@ -48,7 +48,7 @@
  *      0:        IS_VALID(*phDispObject).
  *      error:          *phDispObject == NULL.
  */
-extern int disp_create(OUT struct disp_object **phDispObject,
+extern int disp_create(struct disp_object **phDispObject,
 			      struct dev_object *hdev_obj,
 			      const struct disp_attr *pDispAttrs);
 
@@ -148,7 +148,7 @@ extern int disp_node_create(struct disp_object *hDispObject,
 				   u32 ul_fxn_addr,
 				   u32 ul_create_fxn,
 				   const struct node_createargs
-				   *pargs, OUT nodeenv *pNodeEnv);
+				   *pargs, nodeenv *pNodeEnv);
 
 /*
  *  ======== disp_node_delete ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dmm.h b/drivers/staging/tidspbridge/include/dspbridge/dmm.h
index 72882b7..b8739c1 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dmm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dmm.h
@@ -39,7 +39,7 @@ struct dmm_mgrattrs {
  */
 
 extern int dmm_get_handle(void *hprocessor,
-				 OUT struct dmm_object **phDmmMgr);
+				 struct dmm_object **phDmmMgr);
 
 extern int dmm_reserve_memory(struct dmm_object *dmm_mgr,
 				     u32 size, u32 *prsv_addr);
@@ -57,7 +57,7 @@ extern int dmm_destroy(struct dmm_object *dmm_mgr);
 
 extern int dmm_delete_tables(struct dmm_object *dmm_mgr);
 
-extern int dmm_create(OUT struct dmm_object **phDmmMgr,
+extern int dmm_create(struct dmm_object **phDmmMgr,
 			     struct dev_object *hdev_obj,
 			     const struct dmm_mgrattrs *pMgrAttrs);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h b/drivers/staging/tidspbridge/include/dspbridge/drv.h
index 753a317..1972e41 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/drv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h
@@ -394,7 +394,7 @@ extern int drv_remove_dev_object(struct drv_object *hdrv_obj,
  *      later used by the CFG module.
  */
 extern int drv_request_resources(u32 dw_context,
-					OUT u32 *pDevNodeString);
+					u32 *pDevNodeString);
 
 /*
  *  ======== drv_release_resources ========
@@ -463,7 +463,7 @@ extern void mem_ext_phys_pool_release(void);
  *      location of memory.
  */
 extern void *mem_alloc_phys_mem(u32 byte_size,
-				u32 ulAlign, OUT u32 *pPhysicalAddress);
+				u32 ulAlign, u32 *pPhysicalAddress);
 
 /*
  *  ======== mem_free_phys_mem ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h b/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
index cc4e75b..2ad6089 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspapi-ioctl.h
@@ -339,7 +339,7 @@ union Trapped_Args {
 		struct cmm_object *hcmm_mgr;
 		u32 usize;
 		struct cmm_attrs *pattrs;
-		OUT void **pp_buf_va;
+		void **pp_buf_va;
 	} args_cmm_allocbuf;
 
 	struct {
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h b/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
index 8b943cc..7c2447f 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
@@ -24,14 +24,14 @@
 #ifndef DSPCHNL_
 #define DSPCHNL_
 
-extern int bridge_chnl_create(OUT struct chnl_mgr **phChnlMgr,
+extern int bridge_chnl_create(struct chnl_mgr **phChnlMgr,
 				     struct dev_object *hdev_obj,
 				     const struct chnl_mgrattrs
 				     *pMgrAttrs);
 
 extern int bridge_chnl_destroy(struct chnl_mgr *hchnl_mgr);
 
-extern int bridge_chnl_open(OUT struct chnl_object **phChnl,
+extern int bridge_chnl_open(struct chnl_object **phChnl,
 				   struct chnl_mgr *hchnl_mgr,
 				   s8 chnl_mode,
 				   u32 uChnlId,
@@ -46,7 +46,7 @@ extern int bridge_chnl_add_io_req(struct chnl_object *chnl_obj,
 				      u32 dw_dsp_addr, u32 dw_arg);
 
 extern int bridge_chnl_get_ioc(struct chnl_object *chnl_obj,
-				   u32 dwTimeOut, OUT struct chnl_ioc *pIOC);
+				   u32 dwTimeOut, struct chnl_ioc *pIOC);
 
 extern int bridge_chnl_cancel_io(struct chnl_object *chnl_obj);
 
@@ -54,10 +54,10 @@ extern int bridge_chnl_flush_io(struct chnl_object *chnl_obj,
 				    u32 dwTimeOut);
 
 extern int bridge_chnl_get_info(struct chnl_object *chnl_obj,
-				    OUT struct chnl_info *pInfo);
+				    struct chnl_info *pInfo);
 
 extern int bridge_chnl_get_mgr_info(struct chnl_mgr *hchnl_mgr,
-					u32 uChnlID, OUT struct chnl_mgrinfo
+					u32 uChnlID, struct chnl_mgrinfo
 					*pMgrInfo);
 
 extern int bridge_chnl_idle(struct chnl_object *chnl_obj,
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
index 467ec8b..b772c5d 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
@@ -262,7 +262,7 @@ typedef int(*fxn_brd_status) (struct bridge_dev_context *hDevContext,
  *  Will not write more than ul_num_bytes bytes into pHostBuf.
  */
 typedef int(*fxn_brd_read) (struct bridge_dev_context *hDevContext,
-				   OUT u8 *pHostBuf,
+				   u8 *pHostBuf,
 				   u32 dwDSPAddr,
 				   u32 ul_num_bytes, u32 ulMemType);
 
@@ -322,7 +322,7 @@ typedef int(*fxn_brd_write) (struct bridge_dev_context *hDevContext,
  *      No channel manager exists for this board.
  *  Ensures:
  */
-typedef int(*fxn_chnl_create) (OUT struct chnl_mgr
+typedef int(*fxn_chnl_create) (struct chnl_mgr
 				      **phChnlMgr,
 				      struct dev_object
 				      * hdev_obj,
@@ -406,7 +406,7 @@ typedef void (*fxn_deh_notify) (struct deh_mgr *hdeh_mgr,
  *      0:                *phChnl is a valid channel.
  *      else:                   *phChnl is set to NULL if (phChnl != NULL);
  */
-typedef int(*fxn_chnl_open) (OUT struct chnl_object
+typedef int(*fxn_chnl_open) (struct chnl_object
 				    **phChnl,
 				    struct chnl_mgr *hchnl_mgr,
 				    s8 chnl_mode,
@@ -502,7 +502,7 @@ typedef int(*fxn_chnl_addioreq) (struct chnl_object
  */
 typedef int(*fxn_chnl_getioc) (struct chnl_object *chnl_obj,
 				      u32 dwTimeOut,
-				      OUT struct chnl_ioc *pIOC);
+				      struct chnl_ioc *pIOC);
 
 /*
  *  ======== bridge_chnl_cancel_io ========
@@ -560,7 +560,7 @@ typedef int(*fxn_chnl_flushio) (struct chnl_object *chnl_obj,
  *                      if (pInfo != NULL).
  */
 typedef int(*fxn_chnl_getinfo) (struct chnl_object *chnl_obj,
-				       OUT struct chnl_info *pChnlInfo);
+				       struct chnl_info *pChnlInfo);
 
 /*
  *  ======== bridge_chnl_get_mgr_info ========
@@ -582,7 +582,7 @@ typedef int(*fxn_chnl_getinfo) (struct chnl_object *chnl_obj,
 typedef int(*fxn_chnl_getmgrinfo) (struct chnl_mgr
 					  * hchnl_mgr,
 					  u32 uChnlID,
-					  OUT struct chnl_mgrinfo *pMgrInfo);
+					  struct chnl_mgrinfo *pMgrInfo);
 
 /*
  *  ======== bridge_chnl_idle ========
@@ -678,7 +678,7 @@ typedef int(*fxn_chnl_registernotify)
  *      function returns, they must not be stored into the device context
  *      structure.
  */
-typedef int(*fxn_dev_create) (OUT struct bridge_dev_context
+typedef int(*fxn_dev_create) (struct bridge_dev_context
 				     **phDevContext,
 				     struct dev_object
 				     * hdev_obj,
@@ -702,7 +702,7 @@ typedef int(*fxn_dev_create) (OUT struct bridge_dev_context
  *  Ensures:
  */
 typedef int(*fxn_dev_ctrl) (struct bridge_dev_context *hDevContext,
-				   u32 dw_cmd, OUT void *pargs);
+				   u32 dw_cmd, void *pargs);
 
 /*
  *  ======== bridge_dev_destroy ========
@@ -743,7 +743,7 @@ typedef int(*fxn_dev_destroy) (struct bridge_dev_context *hDevContext);
  *      phIOMgr != NULL;
  *  Ensures:
  */
-typedef int(*fxn_io_create) (OUT struct io_mgr **phIOMgr,
+typedef int(*fxn_io_create) (struct io_mgr **phIOMgr,
 				    struct dev_object *hdev_obj,
 				    const struct io_attrs *pMgrAttrs);
 
@@ -817,7 +817,7 @@ typedef int(*fxn_io_getprocload) (struct io_mgr *hio_mgr,
  *  Ensures:
  */
 typedef int(*fxn_msg_create)
- (OUT struct msg_mgr **phMsgMgr,
+ (struct msg_mgr **phMsgMgr,
   struct dev_object *hdev_obj, msg_onexit msgCallback);
 
 /*
@@ -844,7 +844,7 @@ typedef int(*fxn_msg_create)
  */
 typedef int(*fxn_msg_createqueue)
  (struct msg_mgr *hmsg_mgr,
-  OUT struct msg_queue **phMsgQueue, u32 msgq_id, u32 max_msgs, void *h);
+  struct msg_queue **phMsgQueue, u32 msgq_id, u32 max_msgs, void *h);
 
 /*
  *  ======== bridge_msg_delete ========
@@ -1047,7 +1047,7 @@ struct bridge_drv_interface {
  *  Details:
  *      Called during the Device_Init phase.
  */
-void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
+void bridge_drv_entry(struct bridge_drv_interface **ppDrvInterface,
 		   const char *driver_file_name);
 
 #endif /* DSPDEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdrv.h b/drivers/staging/tidspbridge/include/dspbridge/dspdrv.h
index 2dd4f8b..865f6fe 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdrv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdrv.h
@@ -57,6 +57,6 @@ extern bool dsp_deinit(u32 dwDeviceContext);
  *      Succeeded:  device context > 0
  *      Failed:     device Context = 0
  */
-extern u32 dsp_init(OUT u32 *init_status);
+extern u32 dsp_init(u32 *init_status);
 
 #endif
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspio.h b/drivers/staging/tidspbridge/include/dspbridge/dspio.h
index f382f1a..22dc49c 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspio.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspio.h
@@ -26,7 +26,7 @@
 #include <dspbridge/devdefs.h>
 #include <dspbridge/iodefs.h>
 
-extern int bridge_io_create(OUT struct io_mgr **phIOMgr,
+extern int bridge_io_create(struct io_mgr **phIOMgr,
 				   struct dev_object *hdev_obj,
 				   const struct io_attrs *pMgrAttrs);
 
@@ -36,6 +36,6 @@ extern int bridge_io_on_loaded(struct io_mgr *hio_mgr);
 
 extern int iva_io_on_loaded(struct io_mgr *hio_mgr);
 extern int bridge_io_get_proc_load(struct io_mgr *hio_mgr,
-				       OUT struct dsp_procloadstat *pProcStat);
+				       struct dsp_procloadstat *pProcStat);
 
 #endif /* DSPIO_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h b/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
index 3b9ca4e..7c31bdc 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
@@ -26,12 +26,12 @@
 
 #include <dspbridge/msgdefs.h>
 
-extern int bridge_msg_create(OUT struct msg_mgr **phMsgMgr,
+extern int bridge_msg_create(struct msg_mgr **phMsgMgr,
 				    struct dev_object *hdev_obj,
 				    msg_onexit msgCallback);
 
 extern int bridge_msg_create_queue(struct msg_mgr *hmsg_mgr,
-				       OUT struct msg_queue **phMsgQueue,
+				       struct msg_queue **phMsgQueue,
 				       u32 msgq_id, u32 max_msgs, void *h);
 
 extern void bridge_msg_delete(struct msg_mgr *hmsg_mgr);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io.h b/drivers/staging/tidspbridge/include/dspbridge/io.h
index 8241547..337c299 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io.h
@@ -49,7 +49,7 @@
  *      pMgrAttrs != NULL.
  *  Ensures:
  */
-extern int io_create(OUT struct io_mgr **phIOMgr,
+extern int io_create(struct io_mgr **phIOMgr,
 			    struct dev_object *hdev_obj,
 			    const struct io_attrs *pMgrAttrs);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
index 64cb274..2ae2866 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
@@ -78,7 +78,7 @@ extern void io_cancel_chnl(struct io_mgr *hio_mgr, u32 ulChnl);
  *  Ensures:
  *      Non-preemptible (but interruptible).
  */
-extern void io_dpc(OUT unsigned long pRefData);
+extern void io_dpc(unsigned long pRefData);
 
 /*
  *  ======== io_mbox_msg ========
@@ -116,7 +116,7 @@ void io_mbox_msg(u32 msg);
  */
 extern void io_request_chnl(struct io_mgr *hio_mgr,
 			    struct chnl_object *pchnl,
-			    u8 iMode, OUT u16 *pwMbVal);
+			    u8 iMode, u16 *pwMbVal);
 
 /*
  *  ======== iosm_schedule ========
@@ -190,7 +190,7 @@ extern void io_ddma_clear_chnl_desc(struct io_mgr *hio_mgr, u32 uDDMAChnlId);
 extern void io_ddma_request_chnl(struct io_mgr *hio_mgr,
 				 struct chnl_object *pchnl,
 				 struct chnl_irp *chnl_packet_obj,
-				 OUT u16 *pwMbVal);
+				 u16 *pwMbVal);
 
 /*
  * Zero-copy IO functions
@@ -245,7 +245,7 @@ extern void io_ddzc_clear_chnl_desc(struct io_mgr *hio_mgr, u32 uChnlId);
 extern void io_ddzc_request_chnl(struct io_mgr *hio_mgr,
 				 struct chnl_object *pchnl,
 				 struct chnl_irp *chnl_packet_obj,
-				 OUT u16 *pwMbVal);
+				 u16 *pwMbVal);
 
 /*
  *  ======== io_sh_msetting ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/mgr.h b/drivers/staging/tidspbridge/include/dspbridge/mgr.h
index adfd9b5..f24a7ba 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/mgr.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/mgr.h
@@ -40,7 +40,7 @@
 
 int mgr_wait_for_bridge_events(struct dsp_notification
 				      **anotifications,
-				      u32 count, OUT u32 *pu_index,
+				      u32 count, u32 *pu_index,
 				      u32 utimeout);
 
 /*
@@ -66,7 +66,7 @@ int mgr_wait_for_bridge_events(struct dsp_notification
  *  Details:
  *      DCD Dll is loaded and MGR Object stores the handle of the DLL.
  */
-extern int mgr_create(OUT struct mgr_object **hmgr_obj,
+extern int mgr_create(struct mgr_object **hmgr_obj,
 			     struct cfg_devnode *dev_node_obj);
 
 /*
@@ -119,9 +119,9 @@ extern int mgr_destroy(struct mgr_object *hmgr_obj);
  *  Details:
  */
 extern int mgr_enum_node_info(u32 node_id,
-				     OUT struct dsp_ndbprops *pndb_props,
+				     struct dsp_ndbprops *pndb_props,
 				     u32 undb_props_size,
-				     OUT u32 *pu_num_nodes);
+				     u32 *pu_num_nodes);
 
 /*
  *  ======== mgr_enum_processor_info ========
@@ -150,10 +150,10 @@ extern int mgr_enum_node_info(u32 node_id,
  *  Details:
  */
 extern int mgr_enum_processor_info(u32 processor_id,
-					  OUT struct dsp_processorinfo
+					  struct dsp_processorinfo
 					  *processor_info,
 					  u32 processor_info_size,
-					  OUT u8 *pu_num_procs);
+					  u8 *pu_num_procs);
 /*
  *  ======== mgr_exit ========
  *  Purpose:
@@ -186,7 +186,7 @@ extern void mgr_exit(void);
  *      -EPERM and *phDCDHandle == NULL
  */
 extern int mgr_get_dcd_handle(struct mgr_object
-				     *hMGRHandle, OUT u32 *phDCDHandle);
+				     *hMGRHandle, u32 *phDCDHandle);
 
 /*
  *  ======== mgr_init ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/msg.h b/drivers/staging/tidspbridge/include/dspbridge/msg.h
index baac5f3..b849fc4 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/msg.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/msg.h
@@ -40,7 +40,7 @@
  *      msgCallback != NULL.
  *  Ensures:
  */
-extern int msg_create(OUT struct msg_mgr **phMsgMgr,
+extern int msg_create(struct msg_mgr **phMsgMgr,
 			     struct dev_object *hdev_obj,
 			     msg_onexit msgCallback);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/nldr.h b/drivers/staging/tidspbridge/include/dspbridge/nldr.h
index d8c9688..a1b1996 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/nldr.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/nldr.h
@@ -28,10 +28,10 @@
 extern int nldr_allocate(struct nldr_object *nldr_obj,
 				void *priv_ref, const struct dcd_nodeprops
 				*node_props,
-				OUT struct nldr_nodeobject **phNldrNode,
+				struct nldr_nodeobject **phNldrNode,
 				bool *pf_phase_split);
 
-extern int nldr_create(OUT struct nldr_object **phNldr,
+extern int nldr_create(struct nldr_object **phNldr,
 			      struct dev_object *hdev_obj,
 			      const struct nldr_attrs *pattrs);
 
@@ -42,7 +42,7 @@ extern int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj,
 				    char *pstrFxn, u32 * pulAddr);
 
 extern int nldr_get_rmm_manager(struct nldr_object *hNldrObject,
-				       OUT struct rmm_target_obj **phRmmMgr);
+				       struct rmm_target_obj **phRmmMgr);
 
 extern bool nldr_init(void);
 extern int nldr_load(struct nldr_nodeobject *nldr_node_obj,
diff --git a/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h b/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
index 2f9bea3..af5362e 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
@@ -131,9 +131,9 @@ typedef int(*nldr_allocatefxn) (struct nldr_object *nldr_obj,
 				       void *priv_ref,
 				       const struct dcd_nodeprops
 				       * node_props,
-				       OUT struct nldr_nodeobject
+				       struct nldr_nodeobject
 				       **phNldrNode,
-				       OUT bool *pf_phase_split);
+				       bool *pf_phase_split);
 
 /*
  *  ======== nldr_create ========
@@ -156,7 +156,7 @@ typedef int(*nldr_allocatefxn) (struct nldr_object *nldr_obj,
  *      0:        Valid *phNldr.
  *      error:          *phNldr == NULL.
  */
-typedef int(*nldr_createfxn) (OUT struct nldr_object **phNldr,
+typedef int(*nldr_createfxn) (struct nldr_object **phNldr,
 				     struct dev_object *hdev_obj,
 				     const struct nldr_attrs *pattrs);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/node.h b/drivers/staging/tidspbridge/include/dspbridge/node.h
index 7be6dda..8ec348b 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/node.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/node.h
@@ -60,7 +60,7 @@ extern int node_allocate(struct proc_object *hprocessor,
 				const struct dsp_cbdata
 				*pargs, const struct dsp_nodeattrin
 				*attr_in,
-				OUT struct node_object **ph_node,
+				struct node_object **ph_node,
 				struct process_context *pr_ctxt);
 
 /*
@@ -87,7 +87,7 @@ extern int node_allocate(struct proc_object *hprocessor,
  */
 extern int node_alloc_msg_buf(struct node_object *hnode,
 				     u32 usize, struct dsp_bufferattr
-				     *pattr, OUT u8 **pbuffer);
+				     *pattr, u8 **pbuffer);
 
 /*
  *  ======== node_change_priority ========
@@ -231,7 +231,7 @@ extern int node_create(struct node_object *hnode);
  *      0:        Valide *phNodeMgr.
  *      error:          *phNodeMgr == NULL.
  */
-extern int node_create_mgr(OUT struct node_mgr **phNodeMgr,
+extern int node_create_mgr(struct node_mgr **phNodeMgr,
 				  struct dev_object *hdev_obj);
 
 /*
@@ -299,8 +299,8 @@ extern int node_delete_mgr(struct node_mgr *hnode_mgr);
 extern int node_enum_nodes(struct node_mgr *hnode_mgr,
 				  void **node_tab,
 				  u32 node_tab_size,
-				  OUT u32 *pu_num_nodes,
-				  OUT u32 *pu_allocated);
+				  u32 *pu_num_nodes,
+				  u32 *pu_allocated);
 
 /*
  *  ======== node_exit ========
@@ -358,7 +358,7 @@ extern int node_free_msg_buf(struct node_object *hnode,
  *      0:        *pattrs contains the node's current attributes.
  */
 extern int node_get_attr(struct node_object *hnode,
-				OUT struct dsp_nodeattr *pattr, u32 attr_size);
+				struct dsp_nodeattr *pattr, u32 attr_size);
 
 /*
  *  ======== node_get_message ========
@@ -384,7 +384,7 @@ extern int node_get_attr(struct node_object *hnode,
  *  Ensures:
  */
 extern int node_get_message(struct node_object *hnode,
-				   OUT struct dsp_msg *message, u32 utimeout);
+				   struct dsp_msg *message, u32 utimeout);
 
 /*
  *  ======== node_get_nldr_obj ========
@@ -399,7 +399,7 @@ extern int node_get_message(struct node_object *hnode,
  *  Ensures:
  */
 extern int node_get_nldr_obj(struct node_mgr *hnode_mgr,
-				    OUT struct nldr_object **phNldrObj);
+				    struct nldr_object **phNldrObj);
 
 /*
  *  ======== node_init ========
@@ -544,7 +544,7 @@ extern int node_run(struct node_object *hnode);
  *  Ensures:
  */
 extern int node_terminate(struct node_object *hnode,
-				 OUT int *pstatus);
+				 int *pstatus);
 
 /*
  *  ======== node_get_uuid_props ========
@@ -555,7 +555,7 @@ extern int node_terminate(struct node_object *hnode,
  */
 extern int node_get_uuid_props(void *hprocessor,
 				      const struct dsp_uuid *pNodeId,
-				      OUT struct dsp_ndbprops
+				      struct dsp_ndbprops
 				      *node_props);
 
 #ifdef CONFIG_TIDSPBRIDGE_BACKTRACE
diff --git a/drivers/staging/tidspbridge/include/dspbridge/nodepriv.h b/drivers/staging/tidspbridge/include/dspbridge/nodepriv.h
index 42e1a94..c6e1c09 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/nodepriv.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/nodepriv.h
@@ -102,7 +102,7 @@ struct node_createargs {
  *  Ensures:
  */
 extern int node_get_channel_id(struct node_object *hnode,
-				      u32 dir, u32 index, OUT u32 *pulId);
+				      u32 dir, u32 index, u32 *pulId);
 
 /*
  *  ======== node_get_strm_mgr ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/proc.h b/drivers/staging/tidspbridge/include/dspbridge/proc.h
index 12f2f2a..0c0a4ec 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/proc.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/proc.h
@@ -153,8 +153,8 @@ extern int proc_detach(struct process_context *pr_ctxt);
 extern int proc_enum_nodes(void *hprocessor,
 				  void **node_tab,
 				  u32 node_tab_size,
-				  OUT u32 *pu_num_nodes,
-				  OUT u32 *pu_allocated);
+				  u32 *pu_num_nodes,
+				  u32 *pu_allocated);
 
 /*
  *  ======== proc_get_resource_info ========
@@ -184,7 +184,7 @@ extern int proc_enum_nodes(void *hprocessor,
  */
 extern int proc_get_resource_info(void *hprocessor,
 					 u32 resource_type,
-					 OUT struct dsp_resourceinfo
+					 struct dsp_resourceinfo
 					 *resource_info,
 					 u32 resource_info_size);
 
@@ -256,7 +256,7 @@ extern bool proc_init(void);
  *  Ensures:
  *  Details:
  */
-extern int proc_get_state(void *hprocessor, OUT struct dsp_processorstate
+extern int proc_get_state(void *hprocessor, struct dsp_processorstate
 				 *proc_state_obj, u32 state_info_size);
 
 /*
diff --git a/drivers/staging/tidspbridge/include/dspbridge/strm.h b/drivers/staging/tidspbridge/include/dspbridge/strm.h
index 7b7a243..e1b68d6 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/strm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/strm.h
@@ -46,7 +46,7 @@
  */
 extern int strm_allocate_buffer(struct strm_object *hStrm,
 				       u32 usize,
-				       OUT u8 **ap_buffer,
+				       u8 **ap_buffer,
 				       u32 num_bufs,
 				       struct process_context *pr_ctxt);
 
@@ -90,7 +90,7 @@ extern int strm_close(struct strm_object *hStrm,
  *      0:        Valid *phStrmMgr.
  *      error:          *phStrmMgr == NULL.
  */
-extern int strm_create(OUT struct strm_mgr **phStrmMgr,
+extern int strm_create(struct strm_mgr **phStrmMgr,
 			      struct dev_object *dev_obj);
 
 /*
@@ -158,7 +158,7 @@ extern int strm_free_buffer(struct strm_object *hStrm,
  *  Ensures:
  */
 extern int strm_get_event_handle(struct strm_object *hStrm,
-					OUT void **ph_event);
+					void **ph_event);
 
 /*
  *  ======== strm_get_info ========
@@ -180,7 +180,7 @@ extern int strm_get_event_handle(struct strm_object *hStrm,
  *  Ensures:
  */
 extern int strm_get_info(struct strm_object *hStrm,
-				OUT struct stream_info *stream_info,
+				struct stream_info *stream_info,
 				u32 stream_info_size);
 
 /*
@@ -272,7 +272,7 @@ extern int strm_issue(struct strm_object *hStrm, u8 * pbuf,
  */
 extern int strm_open(struct node_object *hnode, u32 dir,
 			    u32 index, struct strm_attr *pattr,
-			    OUT struct strm_object **phStrm,
+			    struct strm_object **phStrm,
 			    struct process_context *pr_ctxt);
 
 /*
@@ -322,7 +322,7 @@ extern int strm_prepare_buffer(struct strm_object *hStrm,
  *  Ensures:
  */
 extern int strm_reclaim(struct strm_object *hStrm,
-			       OUT u8 **buf_ptr, u32 * pulBytes,
+			       u8 **buf_ptr, u32 * pulBytes,
 			       u32 *pulBufSize, u32 *pdw_arg);
 
 /*
@@ -377,7 +377,7 @@ extern int strm_register_notify(struct strm_object *hStrm,
  *      Error:          *pmask == 0.
  */
 extern int strm_select(struct strm_object **strm_tab,
-			      u32 nStrms, OUT u32 *pmask, u32 utimeout);
+			      u32 nStrms, u32 *pmask, u32 utimeout);
 
 /*
  *  ======== strm_unprepare_buffer ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h b/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h
index a7a64f2..db9dc1e 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/uuidutil.h
@@ -38,7 +38,7 @@
  *  Details:
  *      UUID string limit currently set at MAXUUIDLEN.
  */
-void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, OUT char *pszUuid,
+void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, char *pszUuid,
 			 s32 size);
 
 /*
@@ -57,6 +57,6 @@ void uuid_uuid_to_string(struct dsp_uuid *uuid_obj, OUT char *pszUuid,
  *      "12345678_1234_1234_1234_123456789abc".
  */
 extern void uuid_uuid_from_string(char *pszUuid,
-				  OUT struct dsp_uuid *uuid_obj);
+				  struct dsp_uuid *uuid_obj);
 
 #endif /* UUIDUTIL_ */
diff --git a/drivers/staging/tidspbridge/pmgr/chnl.c b/drivers/staging/tidspbridge/pmgr/chnl.c
index c9787fb..afb48a0 100644
--- a/drivers/staging/tidspbridge/pmgr/chnl.c
+++ b/drivers/staging/tidspbridge/pmgr/chnl.c
@@ -51,7 +51,7 @@ static u32 refs;
  *      Create a channel manager object, responsible for opening new channels
  *      and closing old ones for a given 'Bridge board.
  */
-int chnl_create(OUT struct chnl_mgr **phChnlMgr,
+int chnl_create(struct chnl_mgr **phChnlMgr,
 		       struct dev_object *hdev_obj,
 		       const struct chnl_mgrattrs *pMgrAttrs)
 {
diff --git a/drivers/staging/tidspbridge/pmgr/cmm.c b/drivers/staging/tidspbridge/pmgr/cmm.c
index 9f9b5c5..32e396a 100644
--- a/drivers/staging/tidspbridge/pmgr/cmm.c
+++ b/drivers/staging/tidspbridge/pmgr/cmm.c
@@ -164,7 +164,7 @@ static void un_register_gppsm_seg(struct cmm_allocator *psma);
  *      inUseList.
  */
 void *cmm_calloc_buf(struct cmm_object *hcmm_mgr, u32 usize,
-		     struct cmm_attrs *pattrs, OUT void **pp_buf_va)
+		     struct cmm_attrs *pattrs, void **pp_buf_va)
 {
 	struct cmm_object *cmm_mgr_obj = (struct cmm_object *)hcmm_mgr;
 	void *buf_pa = NULL;
@@ -240,7 +240,7 @@ void *cmm_calloc_buf(struct cmm_object *hcmm_mgr, u32 usize,
  *  Purpose:
  *      Create a communication memory manager object.
  */
-int cmm_create(OUT struct cmm_object **ph_cmm_mgr,
+int cmm_create(struct cmm_object **ph_cmm_mgr,
 		      struct dev_object *hdev_obj,
 		      const struct cmm_mgrattrs *pMgrAttrs)
 {
@@ -429,7 +429,7 @@ int cmm_free_buf(struct cmm_object *hcmm_mgr, void *buf_pa,
  *      Return the communication memory manager object for this device.
  *      This is typically called from the client process.
  */
-int cmm_get_handle(void *hprocessor, OUT struct cmm_object ** ph_cmm_mgr)
+int cmm_get_handle(void *hprocessor, struct cmm_object ** ph_cmm_mgr)
 {
 	int status = 0;
 	struct dev_object *hdev_obj;
@@ -453,7 +453,7 @@ int cmm_get_handle(void *hprocessor, OUT struct cmm_object ** ph_cmm_mgr)
  *      Return the current memory utilization information.
  */
 int cmm_get_info(struct cmm_object *hcmm_mgr,
-			OUT struct cmm_info *cmm_info_obj)
+			struct cmm_info *cmm_info_obj)
 {
 	struct cmm_object *cmm_mgr_obj = (struct cmm_object *)hcmm_mgr;
 	u32 ul_seg;
@@ -954,7 +954,7 @@ static struct cmm_allocator *get_allocator(struct cmm_object *cmm_mgr_obj,
  *  Purpose:
  *      Create an address translator object.
  */
-int cmm_xlator_create(OUT struct cmm_xlatorobject **phXlator,
+int cmm_xlator_create(struct cmm_xlatorobject **phXlator,
 			     struct cmm_object *hcmm_mgr,
 			     struct cmm_xlatorattrs *pXlatorAttrs)
 {
@@ -1075,7 +1075,7 @@ int cmm_xlator_free_buf(struct cmm_xlatorobject *xlator, void *pBufVa)
  *  Purpose:
  *      Set/Get translator info.
  */
-int cmm_xlator_info(struct cmm_xlatorobject *xlator, OUT u8 ** paddr,
+int cmm_xlator_info(struct cmm_xlatorobject *xlator, u8 ** paddr,
 			   u32 ul_size, u32 uSegId, bool set_info)
 {
 	struct cmm_xlator *xlator_obj = (struct cmm_xlator *)xlator;
diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c
index 2aed7a4..0ab12f1 100644
--- a/drivers/staging/tidspbridge/pmgr/cod.c
+++ b/drivers/staging/tidspbridge/pmgr/cod.c
@@ -216,7 +216,7 @@ void cod_close(struct cod_libraryobj *lib)
  *      dynamically loaded object files.
  *
  */
-int cod_create(OUT struct cod_manager **phMgr, char *pstrDummyFile,
+int cod_create(struct cod_manager **phMgr, char *pstrDummyFile,
 		      const struct cod_attrs *attrs)
 {
 	struct cod_manager *mgr_new;
@@ -398,7 +398,7 @@ int cod_get_loader(struct cod_manager *cod_mgr_obj,
  *      given the section name.
  */
 int cod_get_section(struct cod_libraryobj *lib, char *pstrSect,
-			   OUT u32 *puAddr, OUT u32 *puLen)
+			   u32 *puAddr, u32 *puLen)
 {
 	struct cod_manager *cod_mgr_obj;
 	int status = 0;
@@ -627,7 +627,7 @@ int cod_open_base(struct cod_manager *hmgr, char *pszCoffPath,
  *      Retrieve the content of a code section given the section name.
  */
 int cod_read_section(struct cod_libraryobj *lib, char *pstrSect,
-			    OUT char *pstrContent, u32 content_size)
+			    char *pstrContent, u32 content_size)
 {
 	int status = 0;
 
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index 4e4b20a..d05d366 100644
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -92,7 +92,7 @@ static u32 refs;		/* Module reference count */
 static int fxn_not_implemented(int arg, ...);
 static int init_cod_mgr(struct dev_object *dev_obj);
 static void store_interface_fxns(struct bridge_drv_interface *drv_fxns,
-				 OUT struct bridge_drv_interface *intf_fxns);
+				 struct bridge_drv_interface *intf_fxns);
 /*
  *  ======== dev_brd_write_fxn ========
  *  Purpose:
@@ -131,7 +131,7 @@ u32 dev_brd_write_fxn(void *pArb, u32 ulDspAddr, void *pHostBuf,
  *      Called by the operating system to load the PM Bridge Driver for a
  *      PM board (device).
  */
-int dev_create_device(OUT struct dev_object **phDevObject,
+int dev_create_device(struct dev_object **phDevObject,
 			     const char *driver_file_name,
 			     struct cfg_devnode *dev_node_obj)
 {
@@ -260,7 +260,7 @@ int dev_create_device(OUT struct dev_object **phDevObject,
 	}
 leave:
 	/*  If all went well, return a handle to the dev object;
-	 *  else, cleanup and return NULL in the OUT parameter. */
+	 *  else, cleanup and return NULL in the parameter. */
 	if (DSP_SUCCEEDED(status)) {
 		*phDevObject = dev_obj;
 	} else {
@@ -420,7 +420,7 @@ int dev_destroy_device(struct dev_object *hdev_obj)
  *      device.
  */
 int dev_get_chnl_mgr(struct dev_object *hdev_obj,
-			    OUT struct chnl_mgr **phMgr)
+			    struct chnl_mgr **phMgr)
 {
 	int status = 0;
 	struct dev_object *dev_obj = hdev_obj;
@@ -447,7 +447,7 @@ int dev_get_chnl_mgr(struct dev_object *hdev_obj,
  *      device.
  */
 int dev_get_cmm_mgr(struct dev_object *hdev_obj,
-			   OUT struct cmm_object **phMgr)
+			   struct cmm_object **phMgr)
 {
 	int status = 0;
 	struct dev_object *dev_obj = hdev_obj;
@@ -474,7 +474,7 @@ int dev_get_cmm_mgr(struct dev_object *hdev_obj,
  *      device.
  */
 int dev_get_dmm_mgr(struct dev_object *hdev_obj,
-			   OUT struct dmm_object **phMgr)
+			   struct dmm_object **phMgr)
 {
 	int status = 0;
 	struct dev_object *dev_obj = hdev_obj;
@@ -500,7 +500,7 @@ int dev_get_dmm_mgr(struct dev_object *hdev_obj,
  *      Retrieve the COD manager create for this device.
  */
 int dev_get_cod_mgr(struct dev_object *hdev_obj,
-			   OUT struct cod_manager **phCodMgr)
+			   struct cod_manager **phCodMgr)
 {
 	int status = 0;
 	struct dev_object *dev_obj = hdev_obj;
@@ -524,7 +524,7 @@ int dev_get_cod_mgr(struct dev_object *hdev_obj,
  *  ========= dev_get_deh_mgr ========
  */
 int dev_get_deh_mgr(struct dev_object *hdev_obj,
-			   OUT struct deh_mgr **phDehMgr)
+			   struct deh_mgr **phDehMgr)
 {
 	int status = 0;
 
@@ -546,7 +546,7 @@ int dev_get_deh_mgr(struct dev_object *hdev_obj,
  *      Retrieve the platform specific device ID for this device.
  */
 int dev_get_dev_node(struct dev_object *hdev_obj,
-			    OUT struct cfg_devnode **phDevNode)
+			    struct cfg_devnode **phDevNode)
 {
 	int status = 0;
 	struct dev_object *dev_obj = hdev_obj;
@@ -588,7 +588,7 @@ struct dev_object *dev_get_first(void)
  *      ppIntfFxns != NULL.
  */
 int dev_get_intf_fxns(struct dev_object *hdev_obj,
-			     OUT struct bridge_drv_interface **ppIntfFxns)
+			     struct bridge_drv_interface **ppIntfFxns)
 {
 	int status = 0;
 	struct dev_object *dev_obj = hdev_obj;
@@ -612,7 +612,7 @@ int dev_get_intf_fxns(struct dev_object *hdev_obj,
  *  ========= dev_get_io_mgr ========
  */
 int dev_get_io_mgr(struct dev_object *hdev_obj,
-			  OUT struct io_mgr **phIOMgr)
+			  struct io_mgr **phIOMgr)
 {
 	int status = 0;
 
@@ -652,7 +652,7 @@ struct dev_object *dev_get_next(struct dev_object *hdev_obj)
 /*
  *  ========= dev_get_msg_mgr ========
  */
-void dev_get_msg_mgr(struct dev_object *hdev_obj, OUT struct msg_mgr **phMsgMgr)
+void dev_get_msg_mgr(struct dev_object *hdev_obj, struct msg_mgr **phMsgMgr)
 {
 	DBC_REQUIRE(refs > 0);
 	DBC_REQUIRE(phMsgMgr != NULL);
@@ -667,7 +667,7 @@ void dev_get_msg_mgr(struct dev_object *hdev_obj, OUT struct msg_mgr **phMsgMgr)
  *      Retrieve the Node Manager Handle
  */
 int dev_get_node_manager(struct dev_object *hdev_obj,
-				OUT struct node_mgr **phNodeMgr)
+				struct node_mgr **phNodeMgr)
 {
 	int status = 0;
 	struct dev_object *dev_obj = hdev_obj;
@@ -691,7 +691,7 @@ int dev_get_node_manager(struct dev_object *hdev_obj,
  *  ======== dev_get_symbol ========
  */
 int dev_get_symbol(struct dev_object *hdev_obj,
-			  const char *pstrSym, OUT u32 * pul_value)
+			  const char *pstrSym, u32 * pul_value)
 {
 	int status = 0;
 	struct cod_manager *cod_mgr;
@@ -718,7 +718,7 @@ int dev_get_symbol(struct dev_object *hdev_obj,
  *      bridge_dev_create fxn.
  */
 int dev_get_bridge_context(struct dev_object *hdev_obj,
-			       OUT struct bridge_dev_context **phbridge_context)
+			       struct bridge_dev_context **phbridge_context)
 {
 	int status = 0;
 	struct dev_object *dev_obj = hdev_obj;
@@ -974,7 +974,7 @@ static int init_cod_mgr(struct dev_object *dev_obj)
  *      0 and List is not Empty.
  */
 int dev_insert_proc_object(struct dev_object *hdev_obj,
-				  u32 proc_obj, OUT bool *pbAlreadyAttached)
+				  u32 proc_obj, bool *pbAlreadyAttached)
 {
 	int status = 0;
 	struct dev_object *dev_obj = (struct dev_object *)hdev_obj;
@@ -1069,7 +1069,7 @@ int dev_get_dev_type(struct dev_object *hdevObject, u8 *dev_type)
  *      All function pointers in the dev object's fxn interface are not NULL.
  */
 static void store_interface_fxns(struct bridge_drv_interface *drv_fxns,
-				 OUT struct bridge_drv_interface *intf_fxns)
+				 struct bridge_drv_interface *intf_fxns)
 {
 	u32 bridge_version;
 
diff --git a/drivers/staging/tidspbridge/pmgr/dmm.c b/drivers/staging/tidspbridge/pmgr/dmm.c
index 633e77d..9599753 100644
--- a/drivers/staging/tidspbridge/pmgr/dmm.c
+++ b/drivers/staging/tidspbridge/pmgr/dmm.c
@@ -117,7 +117,7 @@ int dmm_create_tables(struct dmm_object *dmm_mgr, u32 addr, u32 size)
  *  Purpose:
  *      Create a dynamic memory manager object.
  */
-int dmm_create(OUT struct dmm_object **phDmmMgr,
+int dmm_create(struct dmm_object **phDmmMgr,
 		      struct dev_object *hdev_obj,
 		      const struct dmm_mgrattrs *pMgrAttrs)
 {
@@ -197,7 +197,7 @@ void dmm_exit(void)
  *      Return the dynamic memory manager object for this device.
  *      This is typically called from the client process.
  */
-int dmm_get_handle(void *hprocessor, OUT struct dmm_object **phDmmMgr)
+int dmm_get_handle(void *hprocessor, struct dmm_object **phDmmMgr)
 {
 	int status = 0;
 	struct dev_object *hdev_obj;
diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
index 2d43031..bfaf88a 100644
--- a/drivers/staging/tidspbridge/pmgr/dspapi.c
+++ b/drivers/staging/tidspbridge/pmgr/dspapi.c
@@ -1127,7 +1127,7 @@ u32 nodewrap_alloc_msg_buf(union Trapped_Args *args, void *pr_ctxt)
 			pattr = &attr;
 
 	}
-	/* OUT argument */
+	/* argument */
 	CP_FM_USR(&pbuffer, args->args_node_allocmsgbuf.pbuffer, status, 1);
 	if (DSP_SUCCEEDED(status)) {
 		status = node_alloc_msg_buf(args->args_node_allocmsgbuf.hnode,
diff --git a/drivers/staging/tidspbridge/pmgr/io.c b/drivers/staging/tidspbridge/pmgr/io.c
index e8f006a..b47786f 100644
--- a/drivers/staging/tidspbridge/pmgr/io.c
+++ b/drivers/staging/tidspbridge/pmgr/io.c
@@ -46,7 +46,7 @@ static u32 refs;
  *      Create an IO manager object, responsible for managing IO between
  *      CHNL and msg_ctrl
  */
-int io_create(OUT struct io_mgr **phIOMgr, struct dev_object *hdev_obj,
+int io_create(struct io_mgr **phIOMgr, struct dev_object *hdev_obj,
 		     const struct io_attrs *pMgrAttrs)
 {
 	struct bridge_drv_interface *intf_fxns;
diff --git a/drivers/staging/tidspbridge/pmgr/msg.c b/drivers/staging/tidspbridge/pmgr/msg.c
index 7dec2ab..3e2937c 100644
--- a/drivers/staging/tidspbridge/pmgr/msg.c
+++ b/drivers/staging/tidspbridge/pmgr/msg.c
@@ -45,7 +45,7 @@ static u32 refs;		/* module reference count */
  *      Create an object to manage message queues. Only one of these objects
  *      can exist per device object.
  */
-int msg_create(OUT struct msg_mgr **phMsgMgr,
+int msg_create(struct msg_mgr **phMsgMgr,
 		      struct dev_object *hdev_obj, msg_onexit msgCallback)
 {
 	struct bridge_drv_interface *intf_fxns;
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c
index 81b91b8..026a6f6 100644
--- a/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -69,10 +69,10 @@ static void compress_buf(char *psz_buf, u32 ul_buf_size, s32 char_size);
 static char dsp_char2_gpp_char(char *pWord, s32 dsp_char_size);
 static int get_dep_lib_info(struct dcd_manager *hdcd_mgr,
 				   struct dsp_uuid *uuid_obj,
-				   OUT u16 *pNumLibs,
-				   OUT u16 *pNumPersLibs,
-				   OUT struct dsp_uuid *pDepLibUuids,
-				   OUT bool *pPersistentDepLibs,
+				   u16 *pNumLibs,
+				   u16 *pNumPersLibs,
+				   struct dsp_uuid *pDepLibUuids,
+				   bool *pPersistentDepLibs,
 				   enum nldr_phase phase);
 
 /*
@@ -125,7 +125,7 @@ int dcd_auto_unregister(struct dcd_manager *hdcd_mgr,
  *      Creates DCD manager.
  */
 int dcd_create_manager(char *pszZlDllName,
-			      OUT struct dcd_manager **phDcdMgr)
+			      struct dcd_manager **phDcdMgr)
 {
 	struct cod_manager *cod_mgr;	/* COD manager handle */
 	struct dcd_manager *dcd_mgr_obj = NULL;	/* DCD Manager pointer */
@@ -194,7 +194,7 @@ int dcd_destroy_manager(struct dcd_manager *hdcd_mgr)
  *      Enumerates objects in the DCD.
  */
 int dcd_enumerate_object(s32 index, enum dsp_dcdobjtype obj_type,
-				OUT struct dsp_uuid *uuid_obj)
+				struct dsp_uuid *uuid_obj)
 {
 	int status = 0;
 	char sz_reg_key[DCD_MAXPATHLENGTH];
@@ -327,8 +327,8 @@ void dcd_exit(void)
  */
 int dcd_get_dep_libs(struct dcd_manager *hdcd_mgr,
 			    struct dsp_uuid *uuid_obj,
-			    u16 numLibs, OUT struct dsp_uuid *pDepLibUuids,
-			    OUT bool *pPersistentDepLibs,
+			    u16 numLibs, struct dsp_uuid *pDepLibUuids,
+			    bool *pPersistentDepLibs,
 			    enum nldr_phase phase)
 {
 	int status = 0;
@@ -351,7 +351,7 @@ int dcd_get_dep_libs(struct dcd_manager *hdcd_mgr,
  */
 int dcd_get_num_dep_libs(struct dcd_manager *hdcd_mgr,
 				struct dsp_uuid *uuid_obj,
-				OUT u16 *pNumLibs, OUT u16 *pNumPersLibs,
+				u16 *pNumLibs, u16 *pNumPersLibs,
 				enum nldr_phase phase)
 {
 	int status = 0;
@@ -377,7 +377,7 @@ int dcd_get_num_dep_libs(struct dcd_manager *hdcd_mgr,
 int dcd_get_object_def(struct dcd_manager *hdcd_mgr,
 			      struct dsp_uuid *pObjUuid,
 			      enum dsp_dcdobjtype obj_type,
-			      OUT struct dcd_genericobj *pObjDef)
+			      struct dcd_genericobj *pObjDef)
 {
 	struct dcd_manager *dcd_mgr_obj = hdcd_mgr;	/* ptr to DCD mgr */
 	struct cod_libraryobj *lib = NULL;
@@ -644,8 +644,8 @@ func_end:
  */
 int dcd_get_library_name(struct dcd_manager *hdcd_mgr,
 				struct dsp_uuid *uuid_obj,
-				OUT char *pstrLibName, OUT u32 * pdwSize,
-				enum nldr_phase phase, OUT bool *phase_split)
+				char *pstrLibName, u32 * pdwSize,
+				enum nldr_phase phase, bool *phase_split)
 {
 	char sz_reg_key[DCD_MAXPATHLENGTH];
 	char sz_uuid[MAXUUIDLEN];
@@ -1391,10 +1391,10 @@ static char dsp_char2_gpp_char(char *pWord, s32 dsp_char_size)
  */
 static int get_dep_lib_info(struct dcd_manager *hdcd_mgr,
 				   struct dsp_uuid *uuid_obj,
-				   OUT u16 *pNumLibs,
-				   OUT u16 *pNumPersLibs,
-				   OUT struct dsp_uuid *pDepLibUuids,
-				   OUT bool *pPersistentDepLibs,
+				   u16 *pNumLibs,
+				   u16 *pNumPersLibs,
+				   struct dsp_uuid *pDepLibUuids,
+				   bool *pPersistentDepLibs,
 				   enum nldr_phase phase)
 {
 	struct dcd_manager *dcd_mgr_obj = hdcd_mgr;
diff --git a/drivers/staging/tidspbridge/rmgr/disp.c b/drivers/staging/tidspbridge/rmgr/disp.c
index cb50077..bbd0d06 100644
--- a/drivers/staging/tidspbridge/rmgr/disp.c
+++ b/drivers/staging/tidspbridge/rmgr/disp.c
@@ -81,13 +81,13 @@ static int fill_stream_def(rms_word *pdw_buf, u32 *ptotal, u32 offset,
 				  struct node_strmdef strm_def, u32 max,
 				  u32 chars_in_rms_word);
 static int send_message(struct disp_object *disp_obj, u32 dwTimeout,
-			       u32 ul_bytes, OUT u32 *pdw_arg);
+			       u32 ul_bytes, u32 *pdw_arg);
 
 /*
  *  ======== disp_create ========
  *  Create a NODE Dispatcher object.
  */
-int disp_create(OUT struct disp_object **phDispObject,
+int disp_create(struct disp_object **phDispObject,
 		       struct dev_object *hdev_obj,
 		       const struct disp_attr *pDispAttrs)
 {
@@ -252,7 +252,7 @@ int disp_node_create(struct disp_object *disp_obj,
 			    struct node_object *hnode, u32 ulRMSFxn,
 			    u32 ul_create_fxn,
 			    const struct node_createargs *pargs,
-			    OUT nodeenv *pNodeEnv)
+			    nodeenv *pNodeEnv)
 {
 	struct node_msgargs node_msg_args;
 	struct node_taskargs task_arg_obj;
diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c
index 112ac87..2777c43 100644
--- a/drivers/staging/tidspbridge/rmgr/drv.c
+++ b/drivers/staging/tidspbridge/rmgr/drv.c
@@ -421,7 +421,7 @@ int drv_proc_update_strm_res(u32 num_bufs, void *hstrm_res)
  *  Purpose:
  *      DRV Object gets created only once during Driver Loading.
  */
-int drv_create(OUT struct drv_object **phDRVObject)
+int drv_create(struct drv_object **phDRVObject)
 {
 	int status = 0;
 	struct drv_object *pdrv_object = NULL;
@@ -968,7 +968,7 @@ void mem_ext_phys_pool_release(void)
  *     Allocate physically contiguous, uncached memory from external memory pool
  */
 
-static void *mem_ext_phys_mem_alloc(u32 bytes, u32 align, OUT u32 * pPhysAddr)
+static void *mem_ext_phys_mem_alloc(u32 bytes, u32 align, u32 * pPhysAddr)
 {
 	u32 new_alloc_ptr;
 	u32 offset;
@@ -1011,7 +1011,7 @@ static void *mem_ext_phys_mem_alloc(u32 bytes, u32 align, OUT u32 * pPhysAddr)
  *  Purpose:
  *      Allocate physically contiguous, uncached memory
  */
-void *mem_alloc_phys_mem(u32 byte_size, u32 ulAlign, OUT u32 * pPhysicalAddress)
+void *mem_alloc_phys_mem(u32 byte_size, u32 ulAlign, u32 * pPhysicalAddress)
 {
 	void *va_mem = NULL;
 	dma_addr_t pa_mem;
diff --git a/drivers/staging/tidspbridge/rmgr/dspdrv.c b/drivers/staging/tidspbridge/rmgr/dspdrv.c
index 2fddbbb..5658cbc 100644
--- a/drivers/staging/tidspbridge/rmgr/dspdrv.c
+++ b/drivers/staging/tidspbridge/rmgr/dspdrv.c
@@ -44,7 +44,7 @@
  *  ======== dsp_init ========
  *  	Allocates bridge resources. Loads a base image onto DSP, if specified.
  */
-u32 dsp_init(OUT u32 *init_status)
+u32 dsp_init(u32 *init_status)
 {
 	char dev_node[MAXREGPATHLENGTH] = "TIOMAP1510";
 	int status = -EPERM;
diff --git a/drivers/staging/tidspbridge/rmgr/mgr.c b/drivers/staging/tidspbridge/rmgr/mgr.c
index a7bc93b..1f8b929 100644
--- a/drivers/staging/tidspbridge/rmgr/mgr.c
+++ b/drivers/staging/tidspbridge/rmgr/mgr.c
@@ -53,7 +53,7 @@ static u32 refs;
  *  Purpose:
  *      MGR Object gets created only once during driver Loading.
  */
-int mgr_create(OUT struct mgr_object **phMgrObject,
+int mgr_create(struct mgr_object **phMgrObject,
 		      struct cfg_devnode *dev_node_obj)
 {
 	int status = 0;
@@ -114,8 +114,8 @@ int mgr_destroy(struct mgr_object *hmgr_obj)
  *      Enumerate and get configuration information about nodes configured
  *      in the node database.
  */
-int mgr_enum_node_info(u32 node_id, OUT struct dsp_ndbprops *pndb_props,
-			      u32 undb_props_size, OUT u32 *pu_num_nodes)
+int mgr_enum_node_info(u32 node_id, struct dsp_ndbprops *pndb_props,
+			      u32 undb_props_size, u32 *pu_num_nodes)
 {
 	int status = 0;
 	struct dsp_uuid node_uuid, temp_uuid;
@@ -178,9 +178,9 @@ func_cont:
  *      DSP processors.
  */
 int mgr_enum_processor_info(u32 processor_id,
-				   OUT struct dsp_processorinfo *
+				   struct dsp_processorinfo *
 				   processor_info, u32 processor_info_size,
-				   OUT u8 *pu_num_procs)
+				   u8 *pu_num_procs)
 {
 	int status = 0;
 	int status1 = 0;
@@ -305,7 +305,7 @@ void mgr_exit(void)
  *      Retrieves the MGR handle. Accessor Function.
  */
 int mgr_get_dcd_handle(struct mgr_object *hMGRHandle,
-			      OUT u32 *phDCDHandle)
+			      u32 *phDCDHandle)
 {
 	int status = -EPERM;
 	struct mgr_object *pmgr_obj = (struct mgr_object *)hMGRHandle;
@@ -355,7 +355,7 @@ bool mgr_init(void)
  *      Block on any Bridge event(s)
  */
 int mgr_wait_for_bridge_events(struct dsp_notification **anotifications,
-				      u32 count, OUT u32 *pu_index,
+				      u32 count, u32 *pu_index,
 				      u32 utimeout)
 {
 	int status;
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c
index aaaab67..8667216 100644
--- a/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -325,7 +325,7 @@ static u32 find_gcf(u32 a, u32 b);
  */
 int nldr_allocate(struct nldr_object *nldr_obj, void *priv_ref,
 			 const struct dcd_nodeprops *node_props,
-			 OUT struct nldr_nodeobject **phNldrNode,
+			 struct nldr_nodeobject **phNldrNode,
 			 bool *pf_phase_split)
 {
 	struct nldr_nodeobject *nldr_node_obj = NULL;
@@ -424,7 +424,7 @@ int nldr_allocate(struct nldr_object *nldr_obj, void *priv_ref,
 /*
  *  ======== nldr_create ========
  */
-int nldr_create(OUT struct nldr_object **phNldr,
+int nldr_create(struct nldr_object **phNldr,
 		       struct dev_object *hdev_obj,
 		       const struct nldr_attrs *pattrs)
 {
@@ -775,7 +775,7 @@ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj,
  *  Given a NLDR object, retrieve RMM Manager Handle
  */
 int nldr_get_rmm_manager(struct nldr_object *hNldrObject,
-				OUT struct rmm_target_obj **phRmmMgr)
+				struct rmm_target_obj **phRmmMgr)
 {
 	int status = 0;
 	struct nldr_object *nldr_obj = hNldrObject;
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index 1f975c6..6d24baf 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -294,7 +294,7 @@ int node_allocate(struct proc_object *hprocessor,
 			 const struct dsp_uuid *pNodeId,
 			 const struct dsp_cbdata *pargs,
 			 const struct dsp_nodeattrin *attr_in,
-			 OUT struct node_object **ph_node,
+			 struct node_object **ph_node,
 			 struct process_context *pr_ctxt)
 {
 	struct node_mgr *hnode_mgr;
@@ -685,8 +685,8 @@ func_end:
  *      Allocates buffer for zero copy messaging.
  */
 DBAPI node_alloc_msg_buf(struct node_object *hnode, u32 usize,
-			 OUT struct dsp_bufferattr *pattr,
-			 OUT u8 **pbuffer)
+			 struct dsp_bufferattr *pattr,
+			 u8 **pbuffer)
 {
 	struct node_object *pnode = (struct node_object *)hnode;
 	int status = 0;
@@ -1300,7 +1300,7 @@ func_end:
  *  Purpose:
  *      Create a NODE Manager object.
  */
-int node_create_mgr(OUT struct node_mgr **phNodeMgr,
+int node_create_mgr(struct node_mgr **phNodeMgr,
 			   struct dev_object *hdev_obj)
 {
 	u32 i;
@@ -1613,8 +1613,8 @@ int node_delete_mgr(struct node_mgr *hnode_mgr)
  *      Enumerate currently allocated nodes.
  */
 int node_enum_nodes(struct node_mgr *hnode_mgr, void **node_tab,
-			   u32 node_tab_size, OUT u32 *pu_num_nodes,
-			   OUT u32 *pu_allocated)
+			   u32 node_tab_size, u32 *pu_num_nodes,
+			   u32 *pu_allocated)
 {
 	struct node_object *hnode;
 	u32 i;
@@ -1716,7 +1716,7 @@ func_end:
  *      structure.
  */
 int node_get_attr(struct node_object *hnode,
-			 OUT struct dsp_nodeattr *pattr, u32 attr_size)
+			 struct dsp_nodeattr *pattr, u32 attr_size)
 {
 	struct node_mgr *hnode_mgr;
 	int status = 0;
@@ -1760,7 +1760,7 @@ int node_get_attr(struct node_object *hnode,
  *      host and a node.
  */
 int node_get_channel_id(struct node_object *hnode, u32 dir, u32 index,
-			       OUT u32 *pulId)
+			       u32 *pulId)
 {
 	enum node_type node_type;
 	int status = -EINVAL;
@@ -1802,7 +1802,7 @@ int node_get_channel_id(struct node_object *hnode, u32 dir, u32 index,
  *      Retrieve a message from a node on the DSP.
  */
 int node_get_message(struct node_object *hnode,
-			    OUT struct dsp_msg *pmsg, u32 utimeout)
+			    struct dsp_msg *pmsg, u32 utimeout)
 {
 	struct node_mgr *hnode_mgr;
 	enum node_type node_type;
@@ -2365,7 +2365,7 @@ func_end:
  *      Signal a node running on the DSP that it should exit its execute phase
  *      function.
  */
-int node_terminate(struct node_object *hnode, OUT int *pstatus)
+int node_terminate(struct node_object *hnode, int *pstatus)
 {
 	struct node_object *pnode = (struct node_object *)hnode;
 	struct node_mgr *hnode_mgr = NULL;
@@ -3005,7 +3005,7 @@ static int get_proc_props(struct node_mgr *hnode_mgr,
  */
 int node_get_uuid_props(void *hprocessor,
 			       const struct dsp_uuid *pNodeId,
-			       OUT struct dsp_ndbprops *node_props)
+			       struct dsp_ndbprops *node_props)
 {
 	struct node_mgr *hnode_mgr = NULL;
 	struct dev_object *hdev_obj;
diff --git a/drivers/staging/tidspbridge/rmgr/proc.c b/drivers/staging/tidspbridge/rmgr/proc.c
index 1f450fe..14de79a 100644
--- a/drivers/staging/tidspbridge/rmgr/proc.c
+++ b/drivers/staging/tidspbridge/rmgr/proc.c
@@ -582,8 +582,8 @@ int proc_detach(struct process_context *pr_ctxt)
  *      on a DSP processor.
  */
 int proc_enum_nodes(void *hprocessor, void **node_tab,
-			   u32 node_tab_size, OUT u32 *pu_num_nodes,
-			   OUT u32 *pu_allocated)
+			   u32 node_tab_size, u32 *pu_num_nodes,
+			   u32 *pu_allocated)
 {
 	int status = -EPERM;
 	struct proc_object *p_proc_object = (struct proc_object *)hprocessor;
@@ -849,7 +849,7 @@ int proc_invalidate_memory(void *hprocessor, void *pmpu_addr, u32 size)
  *      Enumerate the resources currently available on a processor.
  */
 int proc_get_resource_info(void *hprocessor, u32 resource_type,
-				  OUT struct dsp_resourceinfo *resource_info,
+				  struct dsp_resourceinfo *resource_info,
 				  u32 resource_info_size)
 {
 	int status = -EPERM;
@@ -964,7 +964,7 @@ int proc_get_dev_object(void *hprocessor,
  *      Report the state of the specified DSP processor.
  */
 int proc_get_state(void *hprocessor,
-			  OUT struct dsp_processorstate *proc_state_obj,
+			  struct dsp_processorstate *proc_state_obj,
 			  u32 state_info_size)
 {
 	int status = 0;
diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c
index 46149da..6dfb6fe 100644
--- a/drivers/staging/tidspbridge/rmgr/strm.c
+++ b/drivers/staging/tidspbridge/rmgr/strm.c
@@ -98,7 +98,7 @@ static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj);
  *      Allocates buffers for a stream.
  */
 int strm_allocate_buffer(struct strm_object *hStrm, u32 usize,
-				OUT u8 **ap_buffer, u32 num_bufs,
+				u8 **ap_buffer, u32 num_bufs,
 				struct process_context *pr_ctxt)
 {
 	int status = 0;
@@ -200,7 +200,7 @@ func_end:
  *  Purpose:
  *      Create a STRM manager object.
  */
-int strm_create(OUT struct strm_mgr **phStrmMgr,
+int strm_create(struct strm_mgr **phStrmMgr,
 		       struct dev_object *dev_obj)
 {
 	struct strm_mgr *strm_mgr_obj;
@@ -308,7 +308,7 @@ int strm_free_buffer(struct strm_object *hStrm, u8 ** ap_buffer,
  *      Retrieves information about a stream.
  */
 int strm_get_info(struct strm_object *hStrm,
-			 OUT struct stream_info *stream_info,
+			 struct stream_info *stream_info,
 			 u32 stream_info_size)
 {
 	struct bridge_drv_interface *intf_fxns;
@@ -465,7 +465,7 @@ int strm_issue(struct strm_object *hStrm, u8 *pbuf, u32 ul_bytes,
  */
 int strm_open(struct node_object *hnode, u32 dir, u32 index,
 		     struct strm_attr *pattr,
-		     OUT struct strm_object **phStrm,
+		     struct strm_object **phStrm,
 		     struct process_context *pr_ctxt)
 {
 	struct strm_mgr *strm_mgr_obj;
@@ -615,7 +615,7 @@ func_cont:
  *  Purpose:
  *      Relcaims a buffer from a stream.
  */
-int strm_reclaim(struct strm_object *hStrm, OUT u8 ** buf_ptr,
+int strm_reclaim(struct strm_object *hStrm, u8 ** buf_ptr,
 			u32 *pulBytes, u32 *pulBufSize, u32 *pdw_arg)
 {
 	struct bridge_drv_interface *intf_fxns;
@@ -739,7 +739,7 @@ int strm_register_notify(struct strm_object *hStrm, u32 event_mask,
  *      Selects a ready stream.
  */
 int strm_select(struct strm_object **strm_tab, u32 nStrms,
-		       OUT u32 *pmask, u32 utimeout)
+		       u32 *pmask, u32 utimeout)
 {
 	u32 index;
 	struct chnl_info chnl_info_obj;
diff --git a/drivers/staging/tidspbridge/services/cfg.c b/drivers/staging/tidspbridge/services/cfg.c
index 699792c..95a2087 100644
--- a/drivers/staging/tidspbridge/services/cfg.c
+++ b/drivers/staging/tidspbridge/services/cfg.c
@@ -51,7 +51,7 @@ void cfg_exit(void)
  *      Retreive the autostart mask, if any, for this board.
  */
 int cfg_get_auto_start(struct cfg_devnode *dev_node_obj,
-			      OUT u32 *pdwAutoStart)
+			      u32 *pdwAutoStart)
 {
 	int status = 0;
 	u32 dw_buf_size;
@@ -77,7 +77,7 @@ int cfg_get_auto_start(struct cfg_devnode *dev_node_obj,
  *      Retrieve the Device Object handle for a given devnode.
  */
 int cfg_get_dev_object(struct cfg_devnode *dev_node_obj,
-			      OUT u32 *pdwValue)
+			      u32 *pdwValue)
 {
 	int status = 0;
 	u32 dw_buf_size;
@@ -113,7 +113,7 @@ int cfg_get_dev_object(struct cfg_devnode *dev_node_obj,
  *      Retreive the default executable, if any, for this board.
  */
 int cfg_get_exec_file(struct cfg_devnode *dev_node_obj, u32 ul_buf_size,
-			     OUT char *pstrExecFile)
+			     char *pstrExecFile)
 {
 	int status = 0;
 	struct drv_data *drv_datap = dev_get_drvdata(bridge);
@@ -143,7 +143,7 @@ int cfg_get_exec_file(struct cfg_devnode *dev_node_obj, u32 ul_buf_size,
  *  Purpose:
  *      Retrieve the Object handle from the Registry
  */
-int cfg_get_object(OUT u32 *pdwValue, u8 dw_type)
+int cfg_get_object(u32 *pdwValue, u8 dw_type)
 {
 	int status = -EINVAL;
 	struct drv_data *drv_datap = dev_get_drvdata(bridge);
-- 
1.6.3.3

[PATCH 11/11] staging: tidspbridge: remove dbdefs.h

[Nishanth Menon]

Remove yet another custom definition header

Signed-off-by: Nishanth Menon <nm@ti.com>
---
 .../staging/tidspbridge/include/dspbridge/dbdefs.h |    1 -
 .../staging/tidspbridge/include/dspbridge/dbtype.h |   69 --------------------
 .../tidspbridge/include/dspbridge/host_os.h        |    1 -
 3 files changed, 0 insertions(+), 71 deletions(-)
 delete mode 100644 drivers/staging/tidspbridge/include/dspbridge/dbtype.h

diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
index b408cad..ff0ba57 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbdefs.h
@@ -21,7 +21,6 @@
 
 #include <linux/types.h>
 
-#include <dspbridge/dbtype.h>	/* GPP side type definitions */
 #include <dspbridge/rms_sh.h>	/* Types shared between GPP and DSP */
 
 #define PG_SIZE4K 4096
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h b/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
deleted file mode 100644
index ca5eaf8..0000000
--- a/drivers/staging/tidspbridge/include/dspbridge/dbtype.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * dbtype.h
- *
- * DSP-BIOS Bridge driver support functions for TI OMAP processors.
- *
- * This header defines data types for DSP/BIOS Bridge APIs and device
- * driver modules. It also defines the Hungarian prefix to use for each
- * base type.
- *
- * Copyright (C) 2008 Texas Instruments, Inc.
- *
- * This package is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * THIS PACKAGE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
- */
-
-#ifndef DBTYPE_
-#define DBTYPE_
-
-/*===========================================================================*/
-/*  Argument specification syntax */
-/*===========================================================================*/
-
-#ifndef IN
-#define IN			/* Following parameter is for input. */
-#endif
-
-#ifndef OUT
-#define OUT			/* Following parameter is for output. */
-#endif
-
-#ifndef OPTIONAL
-#define OPTIONAL	/* Function may optionally use previous parameter. */
-#endif
-
-#ifndef CONST
-#define CONST   const
-#endif
-
-/*===========================================================================*/
-/*  NULL character   (normally used for string termination) */
-/*===========================================================================*/
-
-#ifndef NULL_CHAR
-#define NULL_CHAR    '\0'	/* Null character. */
-#endif
-
-/*===========================================================================*/
-/*  Basic Type definitions (with Prefixes for Hungarian notation) */
-/*===========================================================================*/
-
-#ifndef OMAPBRIDGE_TYPES
-#define OMAPBRIDGE_TYPES
-typedef volatile unsigned short reg_uword16;
-#endif
-
-#define TEXT(x) x
-
-#define DLLIMPORT
-#define DLLEXPORT
-
-/* Define DSPAPIDLL correctly in dspapi.h */
-#define _DSPSYSDLL32_
-
-#endif /* DBTYPE_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/host_os.h b/drivers/staging/tidspbridge/include/dspbridge/host_os.h
index a91c136..6b4feb4 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/host_os.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/host_os.h
@@ -42,7 +42,6 @@
 #include <linux/vmalloc.h>
 #include <linux/ioport.h>
 #include <linux/platform_device.h>
-#include <dspbridge/dbtype.h>
 #include <plat/clock.h>
 #include <linux/clk.h>
 #include <plat/mailbox.h>
-- 
1.6.3.3

Re: [PATCH 00/11] staging: tidspbridge: header cleanup series

[Felipe Contreras]

On Tue, Jul 13, 2010 at 1:55 AM, Nishanth Menon <nm@ti.com> wrote:
> Series targetted to remove std.h, GlobalTypes.h and dbdefs.h. These
> introduce custom types and macros which dont make sense for linux kernel
>
> Nishanth Menon (11):
>  staging: tidspbridge: remove custom TRUE FALSE
>  staging: tidspbridge: no need for custom NULL
>  staging: tidspbridge: remove std.h
>  staging: tidspbridge: remove custom typedef reg_uword32
>  staging: tidspbridge: remove RET_OK RET_FAIL
>  staging: tidspbridge: remove GlobalTypes.h
>  staging: tidspbridge: replace CONST with c standard const
>  staging: tidspbridge: remove IN modifier
>  staging: tidspbridge: remove OPTIONAL
>  staging: tidspbridge: remove OUT define
>  staging: tidspbridge: remove dbdefs.h

FWIW: Reviewed-by: Felipe Contreras <felipe.contreras@gmail.com>

-- 
Felipe Contreras

RE: [PATCH 08/11] staging: tidspbridge: remove IN modifier

[Ramirez Luna, Omar]

Hi,

>From: Menon, Nishanth
>
>IN modifier does not exist. remove it
>
>Signed-off-by: Nishanth Menon <nm@ti.com>
>---
[...]
>diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h
>b/drivers/staging/tidspbridge/include/dspbridge/drv.h
>index 020bed0..753a317 100644
>--- a/drivers/staging/tidspbridge/include/dspbridge/drv.h
>+++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h
>@@ -70,8 +70,8 @@
> #define OMAP_DMMU_BASE 0x5D000000
> #define OMAP_DMMU_SIZE 0x1000
>
>-#define OMAP_PRCM_VDD1_DOMAIN 1
>-#define OMAP_PRCM_VDD2_DOMAIN 2
>+#define OMAP_PRCM_VDD1_DOMA1
>+#define OMAP_PRCM_VDD2_DOMA2
>

Unexpected change?

Regards,

Omar

Re: [PATCH 08/11] staging: tidspbridge: remove IN modifier

[Nishanth Menon]

On Wed, Jul 21, 2010 at 9:59 AM, Ramirez Luna, Omar <omar.ramirez@ti.com> wrote:
> Hi,
>
>>From: Menon, Nishanth
>>
>>IN modifier does not exist. remove it
>>
>>Signed-off-by: Nishanth Menon <nm@ti.com>
>>---
> [...]
>>diff --git a/drivers/staging/tidspbridge/include/dspbridge/drv.h
>>b/drivers/staging/tidspbridge/include/dspbridge/drv.h
>>index 020bed0..753a317 100644
>>--- a/drivers/staging/tidspbridge/include/dspbridge/drv.h
>>+++ b/drivers/staging/tidspbridge/include/dspbridge/drv.h
>>@@ -70,8 +70,8 @@
>> #define OMAP_DMMU_BASE 0x5D000000
>> #define OMAP_DMMU_SIZE 0x1000
>>
>>-#define OMAP_PRCM_VDD1_DOMAIN 1
>>-#define OMAP_PRCM_VDD2_DOMAIN 2
>>+#define OMAP_PRCM_VDD1_DOMA1
>>+#define OMAP_PRCM_VDD2_DOMA2
>>
>
> Unexpected change?

wooops... Sorry about that..
>
> Regards,
>
> Omar
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>

Re: [PATCH 06/11] staging: tidspbridge: remove GlobalTypes.h

[Greg KH]

On Mon, Jul 12, 2010 at 05:56:04PM -0500, Nishanth Menon wrote:
> Remove custom globaltypes.h header

This patch doesn't apply :(

thanks,

greg k-h

Re: [PATCH 07/11] staging: tidspbridge: replace CONST with c standard const

[Greg KH]

On Mon, Jul 12, 2010 at 05:56:05PM -0500, Nishanth Menon wrote:
> Signed-off-by: Nishanth Menon <nm@ti.com>

This one doesn't apply either, so I'll just stop applying this series
here.  Care to redo the rest of them against the next linux-next so you
can sync back up?

thanks,

greg k-h