staging: ti dspbridge: Rename words with camel case.

The intention of this patch is to rename the remaining variables with camel
case. Variables will be renamed avoiding camel case and Hungarian notation.
The words to be renamed in this patch are:
========================================
hStrm to stream_obj
iMode to io_mode
irqMask to irq_mask
lOffset to offset
memPtr to mem_ptr
moduleId to module_id
msgCallback to msg_callback
msgList to msg_list
nArgc to num_argc
nEntryStart to entry_start
nMemSpace to mem_space
nStatus to node_status
nStrms to strms
numLibs to num_libs
numLockedEntries to num_locked_entries
pageSize to page_sz
========================================

Signed-off-by: Rene Sapiens <rene.sapiens@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

12 files changed, 62 insertions, 62 deletions

diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h
index 6914247fff8..ae711df3a0a 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cod.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h
@@ -50,7 +50,7 @@ struct cod_attrs {
  *  and freeing DSP memory.
  */
 typedef u32(*cod_writefxn) (void *priv_ref, u32 ulDspAddr,
-			    void *pbuf, u32 ul_num_bytes, u32 nMemSpace);
+			    void *pbuf, u32 ul_num_bytes, u32 mem_space);
 
 /*
  *  ======== cod_close ========
@@ -276,7 +276,7 @@ extern bool cod_init(void);
  *      qualified pathname.
  *  Parameters:
  *      hmgr:       manager to load the code with
- *      nArgc:      number of arguments in the args array
+ *      num_argc:   number of arguments in the args array
  *      args:       array of strings for arguments to DSP program
  *      write_fxn:   board-specific function to write data to DSP system
  *      pArb:       arbitrary pointer to be passed as first arg to write_fxn
@@ -287,14 +287,14 @@ extern bool cod_init(void);
  *  Requires:
  *      COD module initialized.
  *      hmgr is valid.
- *      nArgc > 0.
+ *      num_argc > 0.
  *      args != NULL.
  *      args[0] != NULL.
  *      pfn_write != NULL.
  *  Ensures:
  */
 extern int cod_load_base(struct cod_manager *cod_mgr_obj,
-				u32 nArgc, char *args[],
+				u32 num_argc, char *args[],
 				cod_writefxn pfn_write, void *pArb,
 				char *envp[]);
 
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h b/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
index 54e82383348..6658b743bc3 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
@@ -153,7 +153,7 @@ extern void dcd_exit(void);
  *  Parameters:
  *      hdcd_mgr: A DCD manager handle.
  *      uuid_obj: Pointer to a dsp_uuid for a library.
- *      numLibs: Size of uuid array (number of library uuids).
+ *      num_libs: Size of uuid array (number of library uuids).
  *      pDepLibUuids: Array of dependent library uuids to be filled in.
  *      pPersistentDepLibs: Array indicating if corresponding lib is persistent.
  *      phase: phase to obtain correct input library
@@ -171,7 +171,7 @@ extern void dcd_exit(void);
  */
 extern int dcd_get_dep_libs(IN struct dcd_manager *hdcd_mgr,
 				   IN struct dsp_uuid *uuid_obj,
-				   u16 numLibs,
+				   u16 num_libs,
 				   OUT struct dsp_uuid *pDepLibUuids,
 				   OUT bool *pPersistentDepLibs,
 				   IN enum nldr_phase phase);
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h
index 2ee1c41a7e9..72d45915546 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dev.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h
@@ -56,7 +56,7 @@
  */
 extern u32 dev_brd_write_fxn(void *pArb,
 			     u32 ulDspAddr,
-			     void *pHostBuf, u32 ul_num_bytes, u32 nMemSpace);
+			     void *pHostBuf, u32 ul_num_bytes, u32 mem_space);
 
 /*
  *  ======== dev_create_device ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
index 73034c31fa2..fc8f8d31cdf 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h
@@ -806,19 +806,19 @@ typedef int(*fxn_io_getprocload) (struct io_mgr *hio_mgr,
  *  Parameters:
  *      phMsgMgr:           Location to store msg_ctrl manager on output.
  *      hdev_obj:         Handle to a device object.
- *      msgCallback:        Called whenever an RMS_EXIT message is received.
+ *      msg_callback:        Called whenever an RMS_EXIT message is received.
  *  Returns:
  *      0:            Success.
  *      -ENOMEM:        Insufficient memory.
  *  Requires:
  *      phMsgMgr != NULL.
- *      msgCallback != NULL.
+ *      msg_callback != NULL.
  *      hdev_obj != NULL.
  *  Ensures:
  */
 typedef int(*fxn_msg_create)
  (OUT struct msg_mgr **phMsgMgr,
-  struct dev_object *hdev_obj, msg_onexit msgCallback);
+  struct dev_object *hdev_obj, msg_onexit msg_callback);
 
 /*
  *  ======== bridge_msg_create_queue ========
@@ -831,7 +831,7 @@ typedef int(*fxn_msg_create)
  *      phMsgQueue:         Location to store msg_ctrl queue on output.
  *      msgq_id:	    Identifier for messages (node environment pointer).
  *      max_msgs:           Max number of simultaneous messages for the node.
- *      h:                  Handle passed to hmsg_mgr->msgCallback().
+ *      h:                  Handle passed to hmsg_mgr->msg_callback().
  *  Returns:
  *      0:            Success.
  *      -ENOMEM:        Insufficient memory.
diff --git a/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h b/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
index a10634e264b..18f56e1ec09 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dspmsg.h
@@ -28,7 +28,7 @@
 
 extern int bridge_msg_create(OUT struct msg_mgr **phMsgMgr,
 				    struct dev_object *hdev_obj,
-				    msg_onexit msgCallback);
+				    msg_onexit msg_callback);
 
 extern int bridge_msg_create_queue(struct msg_mgr *hmsg_mgr,
 				       OUT struct msg_queue **phMsgQueue,
diff --git a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
index 62899f24b2a..8b0cd7fe493 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io_sm.h
@@ -108,7 +108,7 @@ void io_mbox_msg(u32 msg);
  *  Parameters:
  *      hio_mgr:     IO manager handle.
  *      pchnl:      Ptr to the channel requesting I/O.
- *      iMode:      Mode of channel: {IO_INPUT | IO_OUTPUT}.
+ *      io_mode:      Mode of channel: {IO_INPUT | IO_OUTPUT}.
  *  Returns:
  *  Requires:
  *      pchnl != NULL
@@ -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 io_mode, OUT u16 *pwMbVal);
 
 /*
  *  ======== iosm_schedule ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/msg.h b/drivers/staging/tidspbridge/include/dspbridge/msg.h
index baac5f3a0b2..973bce2cd58 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/msg.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/msg.h
@@ -31,18 +31,18 @@
  *  Parameters:
  *      phMsgMgr:           Location to store msg_ctrl manager handle on output.
  *      hdev_obj:         The device object.
- *      msgCallback:        Called whenever an RMS_EXIT message is received.
+ *      msg_callback:        Called whenever an RMS_EXIT message is received.
  *  Returns:
  *  Requires:
  *      msg_mod_init(void) called.
  *      phMsgMgr != NULL.
  *      hdev_obj != NULL.
- *      msgCallback != NULL.
+ *      msg_callback != NULL.
  *  Ensures:
  */
 extern int msg_create(OUT struct msg_mgr **phMsgMgr,
 			     struct dev_object *hdev_obj,
-			     msg_onexit msgCallback);
+			     msg_onexit msg_callback);
 
 /*
  *  ======== msg_delete ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/msgdefs.h b/drivers/staging/tidspbridge/include/dspbridge/msgdefs.h
index fe24656d210..80a3fa1a8a3 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/msgdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/msgdefs.h
@@ -24,6 +24,6 @@ struct msg_mgr;
 struct msg_queue;
 
 /* Function prototype for callback to be called on RMS_EXIT message received */
-typedef void (*msg_onexit) (void *h, s32 nStatus);
+typedef void (*msg_onexit) (void *h, s32 node_status);
 
 #endif /* MSGDEFS_ */
diff --git a/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h b/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
index 9be048328b6..d53b43e4098 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/nldrdefs.h
@@ -48,7 +48,7 @@ enum nldr_loadtype {
  *      ulDspRunAddr:   Run address of code or data.
  *      ulDspLoadAddr:  Load address of code or data.
  *      ul_num_bytes:     Number of (GPP) bytes to copy.
- *      nMemSpace:      RMS_CODE or RMS_DATA.
+ *      mem_space:      RMS_CODE or RMS_DATA.
  *  Returns:
  *      ul_num_bytes:     Success.
  *      0:              Failure.
@@ -56,7 +56,7 @@ enum nldr_loadtype {
  *  Ensures:
  */
 typedef u32(*nldr_ovlyfxn) (void *priv_ref, u32 ulDspRunAddr,
-			    u32 ulDspLoadAddr, u32 ul_num_bytes, u32 nMemSpace);
+			    u32 ulDspLoadAddr, u32 ul_num_bytes, u32 mem_space);
 
 /*
  *  ======== nldr_writefxn ========
@@ -66,7 +66,7 @@ typedef u32(*nldr_ovlyfxn) (void *priv_ref, u32 ulDspRunAddr,
  *      ulDspAddr:      Address of code or data.
  *      pbuf:           Code or data to be written
  *      ul_num_bytes:     Number of (GPP) bytes to write.
- *      nMemSpace:      DBLL_DATA or DBLL_CODE.
+ *      mem_space:      DBLL_DATA or DBLL_CODE.
  *  Returns:
  *      ul_num_bytes:     Success.
  *      0:              Failure.
@@ -75,7 +75,7 @@ typedef u32(*nldr_ovlyfxn) (void *priv_ref, u32 ulDspRunAddr,
  */
 typedef u32(*nldr_writefxn) (void *priv_ref,
 			     u32 ulDspAddr, void *pbuf,
-			     u32 ul_num_bytes, u32 nMemSpace);
+			     u32 ul_num_bytes, u32 mem_space);
 
 /*
  *  ======== nldr_attrs ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/node.h b/drivers/staging/tidspbridge/include/dspbridge/node.h
index 5358d77075e..9dfa3a8ac8c 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/node.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/node.h
@@ -420,11 +420,11 @@ extern bool node_init(void);
  *      called by the Bridge driver when an exit message for a node is received.
  *  Parameters:
  *      hnode:      Handle of the node that the exit message is for.
- *      nStatus:    Return status of the node's execute phase.
+ *      node_status:    Return status of the node's execute phase.
  *  Returns:
  *  Ensures:
  */
-void node_on_exit(struct node_object *hnode, s32 nStatus);
+void node_on_exit(struct node_object *hnode, s32 node_status);
 
 /*
  *  ======== node_pause ========
diff --git a/drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h b/drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h
index 1fa7d13f470..6c78f2d732a 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h
@@ -48,11 +48,11 @@ extern void drv_proc_node_update_status(void *node_resource, s32 status);
 
 extern int drv_proc_update_strm_res(u32 num_bufs, void *strm_res);
 
-extern int drv_proc_insert_strm_res_element(void *hStrm,
+extern int drv_proc_insert_strm_res_element(void *stream_obj,
 						   void *strm_res,
 						   void *pPctxt);
 
-extern int drv_get_strm_res_element(void *hStrm, void *strm_res,
+extern int drv_get_strm_res_element(void *stream_obj, void *strm_res,
 					   void *ctxt);
 
 extern int drv_proc_remove_strm_res_element(void *strm_res,
diff --git a/drivers/staging/tidspbridge/include/dspbridge/strm.h b/drivers/staging/tidspbridge/include/dspbridge/strm.h
index 2ac630d8330..c4a4d652a64 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/strm.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/strm.h
@@ -29,13 +29,13 @@
  *  Purpose:
  *      Allocate data buffer(s) for use with a stream.
  *  Parameter:
- *      hStrm:          Stream handle returned from strm_open().
+ *      stream_obj:     Stream handle returned from strm_open().
  *      usize:          Size (GPP bytes) of the buffer(s).
  *      num_bufs:       Number of buffers to allocate.
  *      ap_buffer:       Array to hold buffer addresses.
  *  Returns:
  *      0:        Success.
- *      -EFAULT:    Invalid hStrm.
+ *      -EFAULT:    Invalid stream_obj.
  *      -ENOMEM:    Insufficient memory.
  *      -EPERM:      Failure occurred, unable to allocate buffers.
  *      -EINVAL:      usize must be > 0 bytes.
@@ -44,7 +44,7 @@
  *      ap_buffer != NULL.
  *  Ensures:
  */
-extern int strm_allocate_buffer(struct strm_object *hStrm,
+extern int strm_allocate_buffer(struct strm_object *stream_obj,
 				       u32 usize,
 				       OUT u8 **ap_buffer,
 				       u32 num_bufs,
@@ -55,10 +55,10 @@ extern int strm_allocate_buffer(struct strm_object *hStrm,
  *  Purpose:
  *      Close a stream opened with strm_open().
  *  Parameter:
- *      hStrm:          Stream handle returned from strm_open().
+ *      stream_obj:          Stream handle returned from strm_open().
  *  Returns:
  *      0:        Success.
- *      -EFAULT:    Invalid hStrm.
+ *      -EFAULT:    Invalid stream_obj.
  *      -EPIPE:   Some data buffers issued to the stream have not
  *                      been reclaimed.
  *      -EPERM:      Failure to close stream.
@@ -66,7 +66,7 @@ extern int strm_allocate_buffer(struct strm_object *hStrm,
  *      strm_init(void) called.
  *  Ensures:
  */
-extern int strm_close(struct strm_object *hStrm,
+extern int strm_close(struct strm_object *stream_obj,
 			     struct process_context *pr_ctxt);
 
 /*
@@ -125,7 +125,7 @@ extern void strm_exit(void);
  *  Purpose:
  *      Free buffer(s) allocated with strm_allocate_buffer.
  *  Parameter:
- *      hStrm:          Stream handle returned from strm_open().
+ *      stream_obj:     Stream handle returned from strm_open().
  *      ap_buffer:       Array containing buffer addresses.
  *      num_bufs:       Number of buffers to be freed.
  *  Returns:
@@ -137,7 +137,7 @@ extern void strm_exit(void);
  *      ap_buffer != NULL.
  *  Ensures:
  */
-extern int strm_free_buffer(struct strm_object *hStrm,
+extern int strm_free_buffer(struct strm_object *stream_obj,
 				   u8 **ap_buffer, u32 num_bufs,
 				   struct process_context *pr_ctxt);
 
@@ -147,17 +147,17 @@ extern int strm_free_buffer(struct strm_object *hStrm,
  *      Get stream's user event handle. This function is used when closing
  *      a stream, so the event can be closed.
  *  Parameter:
- *      hStrm:          Stream handle returned from strm_open().
+ *      stream_obj:      Stream handle returned from strm_open().
  *      ph_event:        Location to store event handle on output.
  *  Returns:
  *      0:        Success.
- *      -EFAULT:    Invalid hStrm.
+ *      -EFAULT:    Invalid stream_obj.
  *  Requires:
  *      strm_init(void) called.
  *      ph_event != NULL.
  *  Ensures:
  */
-extern int strm_get_event_handle(struct strm_object *hStrm,
+extern int strm_get_event_handle(struct strm_object *stream_obj,
 					OUT void **ph_event);
 
 /*
@@ -166,12 +166,12 @@ extern int strm_get_event_handle(struct strm_object *hStrm,
  *      Get information about a stream. User's dsp_streaminfo is contained
  *      in stream_info struct. stream_info also contains Bridge private info.
  *  Parameters:
- *      hStrm:              Stream handle returned from strm_open().
+ *      stream_obj:         Stream handle returned from strm_open().
  *      stream_info:        Location to store stream info on output.
  *      uSteamInfoSize:     Size of user's dsp_streaminfo structure.
  *  Returns:
  *      0:            Success.
- *      -EFAULT:        Invalid hStrm.
+ *      -EFAULT:        Invalid stream_obj.
  *      -EINVAL:          stream_info_size < sizeof(dsp_streaminfo).
  *      -EPERM:          Unable to get stream info.
  *  Requires:
@@ -179,7 +179,7 @@ extern int strm_get_event_handle(struct strm_object *hStrm,
  *      stream_info != NULL.
  *  Ensures:
  */
-extern int strm_get_info(struct strm_object *hStrm,
+extern int strm_get_info(struct strm_object *stream_obj,
 				OUT struct stream_info *stream_info,
 				u32 stream_info_size);
 
@@ -195,18 +195,18 @@ extern int strm_get_info(struct strm_object *hStrm,
  *      After a successful call to strm_idle(), all buffers can immediately
  *      be reclaimed.
  *  Parameters:
- *      hStrm:          Stream handle returned from strm_open().
+ *      stream_obj:     Stream handle returned from strm_open().
  *      flush_data:     If TRUE, discard output buffers.
  *  Returns:
  *      0:        Success.
- *      -EFAULT:    Invalid hStrm.
+ *      -EFAULT:    Invalid stream_obj.
  *      -ETIME:   A timeout occurred before the stream could be idled.
  *      -EPERM:      Unable to idle stream.
  *  Requires:
  *      strm_init(void) called.
  *  Ensures:
  */
-extern int strm_idle(struct strm_object *hStrm, bool flush_data);
+extern int strm_idle(struct strm_object *stream_obj, bool flush_data);
 
 /*
  *  ======== strm_init ========
@@ -225,14 +225,14 @@ extern bool strm_init(void);
  *  Purpose:
  *      Send a buffer of data to a stream.
  *  Parameters:
- *      hStrm:              Stream handle returned from strm_open().
+ *      stream_obj:         Stream handle returned from strm_open().
  *      pbuf:               Pointer to buffer of data to be sent to the stream.
  *      ul_bytes:            Number of bytes of data in the buffer.
  *      ul_buf_size:          Actual buffer size in bytes.
  *      dw_arg:              A user argument that travels with the buffer.
  *  Returns:
  *      0:            Success.
- *      -EFAULT:        Invalid hStrm.
+ *      -EFAULT:        Invalid stream_obj.
  *      -ENOSR:    The stream is full.
  *      -EPERM:          Failure occurred, unable to issue buffer.
  *  Requires:
@@ -240,7 +240,7 @@ extern bool strm_init(void);
  *      pbuf != NULL.
  *  Ensures:
  */
-extern int strm_issue(struct strm_object *hStrm, IN u8 * pbuf,
+extern int strm_issue(struct strm_object *stream_obj, IN u8 * pbuf,
 			     u32 ul_bytes, u32 ul_buf_size, IN u32 dw_arg);
 
 /*
@@ -281,19 +281,19 @@ extern int strm_open(struct node_object *hnode, u32 dir,
  *      Prepare a data buffer not allocated by DSPStream_AllocateBuffers()
  *      for use with a stream.
  *  Parameter:
- *      hStrm:          Stream handle returned from strm_open().
+ *      stream_obj:     Stream handle returned from strm_open().
  *      usize:          Size (GPP bytes) of the buffer.
  *      pbuffer:        Buffer address.
  *  Returns:
  *      0:        Success.
- *      -EFAULT:    Invalid hStrm.
+ *      -EFAULT:    Invalid stream_obj.
  *      -EPERM:      Failure occurred, unable to prepare buffer.
  *  Requires:
  *      strm_init(void) called.
  *      pbuffer != NULL.
  *  Ensures:
  */
-extern int strm_prepare_buffer(struct strm_object *hStrm,
+extern int strm_prepare_buffer(struct strm_object *stream_obj,
 				      u32 usize, u8 *pbuffer);
 
 /*
@@ -301,7 +301,7 @@ extern int strm_prepare_buffer(struct strm_object *hStrm,
  *  Purpose:
  *      Request a buffer back from a stream.
  *  Parameters:
- *      hStrm:          Stream handle returned from strm_open().
+ *      stream_obj:          Stream handle returned from strm_open().
  *      buf_ptr:        Location to store pointer to reclaimed buffer.
  *      pulBytes:       Location where number of bytes of data in the
  *                      buffer will be written.
@@ -310,7 +310,7 @@ extern int strm_prepare_buffer(struct strm_object *hStrm,
  *                      the buffer will be written.
  *  Returns:
  *      0:        Success.
- *      -EFAULT:    Invalid hStrm.
+ *      -EFAULT:    Invalid stream_obj.
  *      -ETIME:   A timeout occurred before a buffer could be
  *                      retrieved.
  *      -EPERM:      Failure occurred, unable to reclaim buffer.
@@ -321,7 +321,7 @@ extern int strm_prepare_buffer(struct strm_object *hStrm,
  *      pdw_arg != NULL.
  *  Ensures:
  */
-extern int strm_reclaim(struct strm_object *hStrm,
+extern int strm_reclaim(struct strm_object *stream_obj,
 			       OUT u8 **buf_ptr, u32 * pulBytes,
 			       u32 *pulBufSize, u32 *pdw_arg);
 
@@ -330,13 +330,13 @@ extern int strm_reclaim(struct strm_object *hStrm,
  *  Purpose:
  *      Register to be notified on specific events for this stream.
  *  Parameters:
- *      hStrm:          Stream handle returned by strm_open().
+ *      stream_obj:     Stream handle returned by strm_open().
  *      event_mask:     Mask of types of events to be notified about.
  *      notify_type:    Type of notification to be sent.
  *      hnotification:  Handle to be used for notification.
  *  Returns:
  *      0:        Success.
- *      -EFAULT:    Invalid hStrm.
+ *      -EFAULT:    Invalid stream_obj.
  *      -ENOMEM:    Insufficient memory on GPP.
  *      -EINVAL:     event_mask is invalid.
  *      -ENOSYS:   Notification type specified by notify_type is not
@@ -346,7 +346,7 @@ extern int strm_reclaim(struct strm_object *hStrm,
  *      hnotification != NULL.
  *  Ensures:
  */
-extern int strm_register_notify(struct strm_object *hStrm,
+extern int strm_register_notify(struct strm_object *stream_obj,
 				       u32 event_mask, u32 notify_type,
 				       struct dsp_notification
 				       *hnotification);
@@ -357,12 +357,12 @@ extern int strm_register_notify(struct strm_object *hStrm,
  *      Select a ready stream.
  *  Parameters:
  *      strm_tab:       Array of stream handles returned from strm_open().
- *      nStrms:         Number of stream handles in array.
+ *      strms:          Number of stream handles in array.
  *      pmask:          Location to store mask of ready streams on output.
  *      utimeout:       Timeout value (milliseconds).
  *  Returns:
  *      0:        Success.
- *      -EDOM:     nStrms out of range.
+ *      -EDOM:     strms out of range.
 
  *      -EFAULT:    Invalid stream handle in array.
  *      -ETIME:   A timeout occurred before a stream became ready.
@@ -370,14 +370,14 @@ extern int strm_register_notify(struct strm_object *hStrm,
  *  Requires:
  *      strm_init(void) called.
  *      strm_tab != NULL.
- *      nStrms > 0.
+ *      strms > 0.
  *      pmask != NULL.
  *  Ensures:
  *      0:        *pmask != 0 || utimeout == 0.
  *      Error:          *pmask == 0.
  */
 extern int strm_select(IN struct strm_object **strm_tab,
-			      u32 nStrms, OUT u32 *pmask, u32 utimeout);
+			      u32 strms, OUT u32 *pmask, u32 utimeout);
 
 /*
  *  ======== strm_unprepare_buffer ========
@@ -386,19 +386,19 @@ extern int strm_select(IN struct strm_object **strm_tab,
  *      with DSPStream_PrepareBuffer(), and that will no longer be used with
  *      the stream.
  *  Parameter:
- *      hStrm:          Stream handle returned from strm_open().
+ *      stream_obj:     Stream handle returned from strm_open().
  *      usize:          Size (GPP bytes) of the buffer.
  *      pbuffer:        Buffer address.
  *  Returns:
  *      0:        Success.
- *      -EFAULT:    Invalid hStrm.
+ *      -EFAULT:    Invalid stream_obj.
  *      -EPERM:      Failure occurred, unable to unprepare buffer.
  *  Requires:
  *      strm_init(void) called.
  *      pbuffer != NULL.
  *  Ensures:
  */
-extern int strm_unprepare_buffer(struct strm_object *hStrm,
+extern int strm_unprepare_buffer(struct strm_object *stream_obj,
 					u32 usize, u8 *pbuffer);
 
 #endif /* STRM_ */