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:
========================================
hDevContext to dev_ctxt
hDevExtension to dev_extension
hdevObject to device_obj
hDispObject to disp_obj
hDrVObject to driver_obj
hDRVObject to driver_obj
hMGRHandle to mgr_handle
hNldrObject to nldr
hNode1 to node1
hNode2 to node2
hNodeRes to node_resource
hPCtxt to process_ctxt
hProc to proc
hStreamHandle to stream_handle
========================================
Signed-off-by: Rene Sapiens <rene.sapiens@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/tidspbridge/core/io_sm.c

@@ -147,9 +147,9 @@ static void input_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr);
 static void output_msg(struct io_mgr *pio_mgr, struct msg_mgr *hmsg_mgr);
 static u32 find_ready_output(struct chnl_mgr *chnl_mgr_obj,
 			     struct chnl_object *pchnl, u32 mask);
-static u32 read_data(struct bridge_dev_context *hDevContext, void *dest,
+static u32 read_data(struct bridge_dev_context *dev_ctxt, void *dest,
 		     void *pSrc, u32 usize);
-static u32 write_data(struct bridge_dev_context *hDevContext, void *dest,
+static u32 write_data(struct bridge_dev_context *dev_ctxt, void *dest,
 		      void *pSrc, u32 usize);
 
 /* Bus Addr (cached kernel) */
@@ -1701,7 +1701,7 @@ static int register_shm_segs(struct io_mgr *hio_mgr,
  *  ======== read_data ========
  *      Copies buffers from the shared memory to the host buffer.
  */
-static u32 read_data(struct bridge_dev_context *hDevContext, void *dest,
+static u32 read_data(struct bridge_dev_context *dev_ctxt, void *dest,
 		     void *pSrc, u32 usize)
 {
 	memcpy(dest, pSrc, usize);
@@ -1712,7 +1712,7 @@ static u32 read_data(struct bridge_dev_context *hDevContext, void *dest,
  *  ======== write_data ========
  *      Copies buffers from the host side buffer to the shared memory.
  */
-static u32 write_data(struct bridge_dev_context *hDevContext, void *dest,
+static u32 write_data(struct bridge_dev_context *dev_ctxt, void *dest,
 		      void *pSrc, u32 usize)
 {
 	memcpy(dest, pSrc, usize);

drivers/staging/tidspbridge/core/tiomap_io.c

@@ -50,12 +50,12 @@ bool symbols_reloaded = true;
  *  ======== read_ext_dsp_data ========
  *      Copies DSP external memory buffers to the host side buffers.
  */
-int read_ext_dsp_data(struct bridge_dev_context *hDevContext,
+int read_ext_dsp_data(struct bridge_dev_context *dev_ctxt,
 			     OUT u8 *pbHostBuf, u32 dsp_addr,
 			     u32 ul_num_bytes, u32 ulMemType)
 {
 	int status = 0;
-	struct bridge_dev_context *dev_context = hDevContext;
+	struct bridge_dev_context *dev_context = dev_ctxt;
 	u32 offset;
 	u32 ul_tlb_base_virt = 0;
 	u32 ul_shm_offset_virt = 0;
@@ -178,13 +178,13 @@ int read_ext_dsp_data(struct bridge_dev_context *hDevContext,
  *  purpose:
  *      Copies buffers to the DSP internal/external memory.
  */
-int write_dsp_data(struct bridge_dev_context *hDevContext,
+int write_dsp_data(struct bridge_dev_context *dev_ctxt,
 			  IN u8 *pbHostBuf, u32 dsp_addr, u32 ul_num_bytes,
 			  u32 ulMemType)
 {
 	u32 offset;
-	u32 dw_base_addr = hDevContext->dw_dsp_base_addr;
-	struct cfg_hostres *resources = hDevContext->resources;
+	u32 dw_base_addr = dev_ctxt->dw_dsp_base_addr;
+	struct cfg_hostres *resources = dev_ctxt->resources;
 	int status = 0;
 	u32 base1, base2, base3;
 	base1 = OMAP_DSP_MEM1_SIZE;
@@ -194,7 +194,7 @@ int write_dsp_data(struct bridge_dev_context *hDevContext,
 	if (!resources)
 		return -EPERM;
 
-	offset = dsp_addr - hDevContext->dw_dsp_start_add;
+	offset = dsp_addr - dev_ctxt->dw_dsp_start_add;
 	if (offset < base1) {
 		dw_base_addr = MEM_LINEAR_ADDRESS(resources->dw_mem_base[2],
 						  resources->dw_mem_length[2]);

drivers/staging/tidspbridge/include/dspbridge/dev.h

@@ -41,7 +41,7 @@
  *      device's bridge_brd_write() function.
  *  Parameters:
  *      pArb:           Handle to a Device Object.
- *      hDevContext:    Handle to Bridge driver defined device info.
+ *      dev_ctxt:    Handle to Bridge driver defined device info.
  *      dsp_addr:       Address on DSP board (Destination).
  *      pHostBuf:       Pointer to host buffer (Source).
  *      ul_num_bytes:     Number of bytes to transfer.
@@ -336,7 +336,7 @@ extern int dev_get_dev_node(struct dev_object *hdev_obj,
  *      0:        *phDevNode contains a platform specific device ID;
  *      else:           *phDevNode is NULL.
  */
-extern int dev_get_dev_type(struct dev_object *hdevObject,
+extern int dev_get_dev_type(struct dev_object *device_obj,
 					u8 *dev_type);
 
 /*

drivers/staging/tidspbridge/include/dspbridge/disp.h

@@ -57,15 +57,15 @@ extern int disp_create(OUT struct disp_object **phDispObject,
  *  Delete the NODE Dispatcher.
  *
  *  Parameters:
- *      hDispObject:  Node Dispatcher object.
+ *      disp_obj:  Node Dispatcher object.
  *  Returns:
  *  Requires:
  *      disp_init(void) called.
- *      Valid hDispObject.
+ *      Valid disp_obj.
  *  Ensures:
- *      hDispObject is invalid.
+ *      disp_obj is invalid.
  */
-extern void disp_delete(struct disp_object *hDispObject);
+extern void disp_delete(struct disp_object *disp_obj);
 
 /*
  *  ======== disp_exit ========
@@ -97,7 +97,7 @@ extern bool disp_init(void);
  *  Change the priority of a node currently running on the target.
  *
  *  Parameters:
- *      hDispObject:            Node Dispatcher object.
+ *      disp_obj:            Node Dispatcher object.
  *      hnode:                  Node object representing a node currently
  *                              allocated or running on the DSP.
  *      ulFxnAddress:           Address of RMS function for changing priority.
@@ -108,12 +108,12 @@ extern bool disp_init(void);
  *      -ETIME:           A timeout occurred before the DSP responded.
  *  Requires:
  *      disp_init(void) called.
- *      Valid hDispObject.
+ *      Valid disp_obj.
  *      hnode != NULL.
  *  Ensures:
  */
 extern int disp_node_change_priority(struct disp_object
-					    *hDispObject,
+					    *disp_obj,
 					    struct node_object *hnode,
 					    u32 ul_fxn_addr,
 					    nodeenv node_env, s32 prio);
@@ -123,7 +123,7 @@ extern int disp_node_change_priority(struct disp_object
  *  Create a node on the DSP by remotely calling the node's create function.
  *
  *  Parameters:
- *      hDispObject:    Node Dispatcher object.
+ *      disp_obj:    Node Dispatcher object.
  *      hnode:          Node handle obtained from node_allocate().
  *      ul_fxn_addr:      Address or RMS create node function.
  *      ul_create_fxn:    Address of node's create function.
@@ -136,14 +136,14 @@ extern int disp_node_change_priority(struct disp_object
  *      -EPERM:      A failure occurred, unable to create node.
  *  Requires:
  *      disp_init(void) called.
- *      Valid hDispObject.
+ *      Valid disp_obj.
  *      pargs != NULL.
  *      hnode != NULL.
  *      pNodeEnv != NULL.
  *      node_get_type(hnode) != NODE_DEVICE.
  *  Ensures:
  */
-extern int disp_node_create(struct disp_object *hDispObject,
+extern int disp_node_create(struct disp_object *disp_obj,
 				   struct node_object *hnode,
 				   u32 ul_fxn_addr,
 				   u32 ul_create_fxn,
@@ -155,7 +155,7 @@ extern int disp_node_create(struct disp_object *hDispObject,
  *  Delete a node on the DSP by remotely calling the node's delete function.
  *
  *  Parameters:
- *      hDispObject:    Node Dispatcher object.
+ *      disp_obj:    Node Dispatcher object.
  *      hnode:          Node object representing a node currently
  *                      loaded on the DSP.
  *      ul_fxn_addr:      Address or RMS delete node function.
@@ -166,11 +166,11 @@ extern int disp_node_create(struct disp_object *hDispObject,
  *      -ETIME:   A timeout occurred before the DSP responded.
  *  Requires:
  *      disp_init(void) called.
- *      Valid hDispObject.
+ *      Valid disp_obj.
  *      hnode != NULL.
  *  Ensures:
  */
-extern int disp_node_delete(struct disp_object *hDispObject,
+extern int disp_node_delete(struct disp_object *disp_obj,
 				   struct node_object *hnode,
 				   u32 ul_fxn_addr,
 				   u32 ul_delete_fxn, nodeenv node_env);
@@ -181,7 +181,7 @@ extern int disp_node_delete(struct disp_object *hDispObject,
  *  that has been suspended (via DISP_NodePause()) on the DSP.
  *
  *  Parameters:
- *      hDispObject:    Node Dispatcher object.
+ *      disp_obj:    Node Dispatcher object.
  *      hnode:          Node object representing a node to be executed
  *                      on the DSP.
  *      ul_fxn_addr:      Address or RMS node execute function.
@@ -192,11 +192,11 @@ extern int disp_node_delete(struct disp_object *hDispObject,
  *      -ETIME:   A timeout occurred before the DSP responded.
  *  Requires:
  *      disp_init(void) called.
- *      Valid hDispObject.
+ *      Valid disp_obj.
  *      hnode != NULL.
  *  Ensures:
  */
-extern int disp_node_run(struct disp_object *hDispObject,
+extern int disp_node_run(struct disp_object *disp_obj,
 				struct node_object *hnode,
 				u32 ul_fxn_addr,
 				u32 ul_execute_fxn, nodeenv node_env);

drivers/staging/tidspbridge/include/dspbridge/drv.h

@@ -313,16 +313,16 @@ extern u32 drv_get_next_dev_object(u32 hdev_obj);
  *  Purpose:
  *      Returns the Ptr to the Next Device Extension from the the List
  *  Parameters:
- *      hDevExtension:      Handle to the Device Extension
+ *      dev_extension:      Handle to the Device Extension
  *  Requires:
  *      DRV Initialized
- *      hDevExtension != 0.
+ *      dev_extension != 0.
  *  Returns:
  *      dw_dev_extension:     Ptr to the Next Dev Extension
  *      0:                  If it fail to Get the next Dev Extension
  *  Ensures:
  */
-extern u32 drv_get_next_dev_extension(u32 hDevExtension);
+extern u32 drv_get_next_dev_extension(u32 dev_extension);
 
 /*
  *  ======== drv_init ========

drivers/staging/tidspbridge/include/dspbridge/io_sm.h

@@ -270,21 +270,21 @@ extern int io_sh_msetting(struct io_mgr *hio_mgr, u8 desc, void *pargs);
 /* Maximum channel bufsize that can be used. */
 extern u32 io_buf_size(struct io_mgr *hio_mgr);
 
-extern u32 io_read_value(struct bridge_dev_context *hDevContext, u32 dsp_addr);
+extern u32 io_read_value(struct bridge_dev_context *dev_ctxt, u32 dsp_addr);
 
-extern void io_write_value(struct bridge_dev_context *hDevContext,
+extern void io_write_value(struct bridge_dev_context *dev_ctxt,
 			   u32 dsp_addr, u32 value);
 
-extern u32 io_read_value_long(struct bridge_dev_context *hDevContext,
+extern u32 io_read_value_long(struct bridge_dev_context *dev_ctxt,
 			      u32 dsp_addr);
 
-extern void io_write_value_long(struct bridge_dev_context *hDevContext,
+extern void io_write_value_long(struct bridge_dev_context *dev_ctxt,
 				u32 dsp_addr, u32 value);
 
-extern void io_or_set_value(struct bridge_dev_context *hDevContext,
+extern void io_or_set_value(struct bridge_dev_context *dev_ctxt,
 			    u32 dsp_addr, u32 value);
 
-extern void io_and_set_value(struct bridge_dev_context *hDevContext,
+extern void io_and_set_value(struct bridge_dev_context *dev_ctxt,
 			     u32 dsp_addr, u32 value);
 
 extern void io_intr_dsp2(IN struct io_mgr *pio_mgr, IN u16 mb_val);

drivers/staging/tidspbridge/include/dspbridge/mgr.h

@@ -173,7 +173,7 @@ extern void mgr_exit(void);
  *  Purpose:
  *      Retrieves the MGR handle. Accessor Function
  *  Parameters:
- *      hMGRHandle:     Handle to the Manager Object
+ *      mgr_handle:     Handle to the Manager Object
  *      phDCDHandle:    Ptr to receive the DCD Handle.
  *  Returns:
  *      0:        Sucess
@@ -186,7 +186,7 @@ extern void mgr_exit(void);
  *      -EPERM and *phDCDHandle == NULL
  */
 extern int mgr_get_dcd_handle(IN struct mgr_object
-				     *hMGRHandle, OUT u32 *phDCDHandle);
+				     *mgr_handle, OUT u32 *phDCDHandle);
 
 /*
  *  ======== mgr_init ========

drivers/staging/tidspbridge/include/dspbridge/nldr.h

@@ -41,7 +41,7 @@ extern void nldr_exit(void);
 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,
+extern int nldr_get_rmm_manager(struct nldr_object *nldr,
 				       OUT struct rmm_target_obj **phRmmMgr);
 
 extern bool nldr_init(void);

drivers/staging/tidspbridge/include/dspbridge/node.h

@@ -118,32 +118,32 @@ extern int node_change_priority(struct node_object *hnode, s32 prio);
  *      Delete all nodes whose owning processor is being destroyed.
  *  Parameters:
  *      hnode_mgr:       Node manager object.
- *      hProc:          Handle to processor object being destroyed.
+ *      proc:          Handle to processor object being destroyed.
  *  Returns:
  *      0:        Success.
- *      -EPERM:      Unable to delete all nodes belonging to hProc.
+ *      -EPERM:      Unable to delete all nodes belonging to proc.
  *  Requires:
  *      Valid hnode_mgr.
- *      hProc != NULL.
+ *      proc != NULL.
  *  Ensures:
  */
 extern int node_close_orphans(struct node_mgr *hnode_mgr,
-				     struct proc_object *hProc);
+				     struct proc_object *proc);
 
 /*
  *  ======== node_connect ========
  *  Purpose:
  *      Connect two nodes on the DSP, or a node on the DSP to the GPP. In the
  *      case that the connnection is being made between a node on the DSP and
- *      the GPP, one of the node handles (either hNode1 or hNode2) must be
+ *      the GPP, one of the node handles (either node1 or node2) must be
  *      the constant NODE_HGPPNODE.
  *  Parameters:
- *      hNode1:         Handle of first node to connect to second node. If
- *                      this is a connection from the GPP to hNode2, hNode1
- *                      must be the constant NODE_HGPPNODE. Otherwise, hNode1
+ *      node1:         Handle of first node to connect to second node. If
+ *                      this is a connection from the GPP to node2, node1
+ *                      must be the constant NODE_HGPPNODE. Otherwise, node1
  *                      must be a node handle returned from a successful call
  *                      to Node_Allocate().
- *      hNode2:         Handle of second node. Must be either NODE_HGPPNODE
+ *      node2:         Handle of second node. Must be either NODE_HGPPNODE
  *                      if this is a connection from DSP node to GPP, or a
  *                      node handle returned from a successful call to
  *                      node_allocate().
@@ -163,12 +163,12 @@ extern int node_close_orphans(struct node_mgr *hnode_mgr,
  *                      pass binary data.
  *  Returns:
  *      0:                Success.
- *      -EFAULT:            Invalid hNode1 or hNode2.
+ *      -EFAULT:            Invalid node1 or node2.
  *      -ENOMEM:            Insufficient host memory.
  *      -EINVAL:             A stream index parameter is invalid.
  *      -EISCONN:  A connection already exists for one of the
  *                              indices uStream1 or uStream2.
- *      -EBADR:        Either hNode1 or hNode2 is not in the
+ *      -EBADR:        Either node1 or node2 is not in the
  *                              NODE_ALLOCATED state.
  *      -ECONNREFUSED: No more connections available.
  *      -EPERM:              Attempt to make an illegal connection (eg,
@@ -178,9 +178,9 @@ extern int node_close_orphans(struct node_mgr *hnode_mgr,
  *      node_init(void) called.
  *  Ensures:
  */
-extern int node_connect(struct node_object *hNode1,
+extern int node_connect(struct node_object *node1,
 			       u32 uStream1,
-			       struct node_object *hNode2,
+			       struct node_object *node2,
 			       u32 uStream2,
 			       OPTIONAL IN struct dsp_strmattr *pattrs,
 			       OPTIONAL IN struct dsp_cbdata

drivers/staging/tidspbridge/include/dspbridge/proc.h

@@ -364,7 +364,7 @@ extern int proc_register_notify(void *hprocessor,
  *  Purpose:
  *      Notify the Processor Clients
  *  Parameters:
- *      hProc       :   The processor handle.
+ *      proc       :   The processor handle.
  *      uEvents     :   Event to be notified about.
  *  Returns:
  *      0     :   Success.
@@ -372,18 +372,18 @@ extern int proc_register_notify(void *hprocessor,
  *      -EPERM   :   Failure to Set or Reset the Event
  *  Requires:
  *      uEvents is Supported or Valid type of Event
- *      hProc is a valid handle
+ *      proc is a valid handle
  *      PROC Initialized.
  *  Ensures:
  */
-extern int proc_notify_clients(void *hProc, u32 uEvents);
+extern int proc_notify_clients(void *proc, u32 uEvents);
 
 /*
  *  ======== proc_notify_all_clients ========
  *  Purpose:
  *      Notify the Processor Clients
  *  Parameters:
- *      hProc       :   The processor handle.
+ *      proc       :   The processor handle.
  *      uEvents     :   Event to be notified about.
  *  Returns:
  *      0     :   Success.
@@ -391,14 +391,14 @@ extern int proc_notify_clients(void *hProc, u32 uEvents);
  *      -EPERM   :   Failure to Set or Reset the Event
  *  Requires:
  *      uEvents is Supported or Valid type of Event
- *      hProc is a valid handle
+ *      proc is a valid handle
  *      PROC Initialized.
  *  Ensures:
  *  Details:
  *      NODE And STRM would use this function to notify their clients
  *      about the state changes in NODE or STRM.
  */
-extern int proc_notify_all_clients(void *hProc, u32 uEvents);
+extern int proc_notify_all_clients(void *proc, u32 uEvents);
 
 /*
  *  ======== proc_start ========

drivers/staging/tidspbridge/include/dspbridge/resourcecleanup.h

@@ -20,8 +20,8 @@
 extern int drv_get_proc_ctxt_list(struct process_context **pPctxt,
 					 struct drv_object *hdrv_obj);
 
-extern int drv_insert_proc_context(struct drv_object *hDrVObject,
-					  void *hPCtxt);
+extern int drv_insert_proc_context(struct drv_object *driver_obj,
+					  void *process_ctxt);
 
 extern int drv_remove_all_dmm_res_elements(void *ctxt);
 
@@ -31,7 +31,7 @@ extern int drv_proc_set_pid(void *ctxt, s32 process);
 
 extern int drv_remove_all_resources(void *pPctxt);
 
-extern int drv_remove_proc_context(struct drv_object *hDRVObject,
+extern int drv_remove_proc_context(struct drv_object *driver_obj,
 					  void *pr_ctxt);
 
 extern int drv_get_node_res_element(void *hnode, void *node_res,
@@ -40,11 +40,11 @@ extern int drv_get_node_res_element(void *hnode, void *node_res,
 extern int drv_insert_node_res_element(void *hnode, void *node_res,
 					      void *ctxt);
 
-extern void drv_proc_node_update_heap_status(void *hNodeRes, s32 status);
+extern void drv_proc_node_update_heap_status(void *node_resource, s32 status);
 
 extern int drv_remove_node_res_element(void *node_res, void *status);
 
-extern void drv_proc_node_update_status(void *hNodeRes, s32 status);
+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);
 

drivers/staging/tidspbridge/pmgr/dev.c

@@ -1038,10 +1038,10 @@ int dev_remove_proc_object(struct dev_object *hdev_obj, u32 proc_obj)
 	return status;
 }
 
-int dev_get_dev_type(struct dev_object *hdevObject, u8 *dev_type)
+int dev_get_dev_type(struct dev_object *device_obj, u8 *dev_type)
 {
 	int status = 0;
-	struct dev_object *dev_obj = (struct dev_object *)hdevObject;
+	struct dev_object *dev_obj = (struct dev_object *)device_obj;
 
 	*dev_type = dev_obj->dev_type;
 

drivers/staging/tidspbridge/rmgr/drv.c

@@ -73,16 +73,16 @@ static int request_bridge_resources(struct cfg_hostres *res);
 
 /* GPP PROCESS CLEANUP CODE */
 
-static int drv_proc_free_node_res(void *hPCtxt);
+static int drv_proc_free_node_res(void *process_ctxt);
 
 /* Allocate and add a node resource element
 * This function is called from .Node_Allocate. */
-int drv_insert_node_res_element(void *hnode, void *hNodeRes,
-				       void *hPCtxt)
+int drv_insert_node_res_element(void *hnode, void *node_resource,
+				       void *process_ctxt)
 {
 	struct node_res_object **node_res_obj =
-	    (struct node_res_object **)hNodeRes;
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	    (struct node_res_object **)node_resource;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	int status = 0;
 	struct node_res_object *temp_node_res = NULL;
 
@@ -113,11 +113,11 @@ int drv_insert_node_res_element(void *hnode, void *hNodeRes,
 
 /* Release all Node resources and its context
 * This is called from .Node_Delete. */
-int drv_remove_node_res_element(void *hNodeRes, void *hPCtxt)
+int drv_remove_node_res_element(void *node_resource, void *process_ctxt)
 {
 	struct node_res_object *node_res_obj =
-	    (struct node_res_object *)hNodeRes;
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	    (struct node_res_object *)node_resource;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	struct node_res_object *temp_node;
 	int status = 0;
 
@@ -140,9 +140,9 @@ int drv_remove_node_res_element(void *hNodeRes, void *hPCtxt)
 }
 
 /* Actual Node De-Allocation */
-static int drv_proc_free_node_res(void *hPCtxt)
+static int drv_proc_free_node_res(void *process_ctxt)
 {
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	int status = 0;
 	struct node_res_object *node_list = NULL;
 	struct node_res_object *node_res_obj = NULL;
@@ -169,9 +169,9 @@ static int drv_proc_free_node_res(void *hPCtxt)
 }
 
 /* Release all Mapped and Reserved DMM resources */
-int drv_remove_all_dmm_res_elements(void *hPCtxt)
+int drv_remove_all_dmm_res_elements(void *process_ctxt)
 {
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	int status = 0;
 	struct dmm_map_object *temp_map, *map_obj;
 	struct dmm_rsv_object *temp_rsv, *rsv_obj;
@@ -198,29 +198,29 @@ int drv_remove_all_dmm_res_elements(void *hPCtxt)
 }
 
 /* Update Node allocation status */
-void drv_proc_node_update_status(void *hNodeRes, s32 status)
+void drv_proc_node_update_status(void *node_resource, s32 status)
 {
 	struct node_res_object *node_res_obj =
-	    (struct node_res_object *)hNodeRes;
-	DBC_ASSERT(hNodeRes != NULL);
+	    (struct node_res_object *)node_resource;
+	DBC_ASSERT(node_resource != NULL);
 	node_res_obj->node_allocated = status;
 }
 
 /* Update Node Heap status */
-void drv_proc_node_update_heap_status(void *hNodeRes, s32 status)
+void drv_proc_node_update_heap_status(void *node_resource, s32 status)
 {
 	struct node_res_object *node_res_obj =
-	    (struct node_res_object *)hNodeRes;
-	DBC_ASSERT(hNodeRes != NULL);
+	    (struct node_res_object *)node_resource;
+	DBC_ASSERT(node_resource != NULL);
 	node_res_obj->heap_allocated = status;
 }
 
 /* Release all Node resources and its context
 * This is called from .bridge_release.
  */
-int drv_remove_all_node_res_elements(void *hPCtxt)
+int drv_remove_all_node_res_elements(void *process_ctxt)
 {
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	int status = 0;
 	struct node_res_object *temp_node2 = NULL;
 	struct node_res_object *temp_node = NULL;
@@ -237,11 +237,12 @@ int drv_remove_all_node_res_elements(void *hPCtxt)
 }
 
 /* Getting the node resource element */
-int drv_get_node_res_element(void *hnode, void *hNodeRes,
-				    void *hPCtxt)
+int drv_get_node_res_element(void *hnode, void *node_resource,
+				    void *process_ctxt)
 {
-	struct node_res_object **node_res = (struct node_res_object **)hNodeRes;
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	struct node_res_object **node_res =
+				     (struct node_res_object **)node_resource;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	int status = 0;
 	struct node_res_object *temp_node2 = NULL;
 	struct node_res_object *temp_node = NULL;
@@ -268,12 +269,12 @@ int drv_get_node_res_element(void *hnode, void *hNodeRes,
 /* Allocate the STRM resource element
 * This is called after the actual resource is allocated
  */
-int drv_proc_insert_strm_res_element(void *hStreamHandle,
-					    void *hstrm_res, void *hPCtxt)
+int drv_proc_insert_strm_res_element(void *stream_handle,
+					    void *hstrm_res, void *process_ctxt)
 {
 	struct strm_res_object **pstrm_res =
 	    (struct strm_res_object **)hstrm_res;
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	int status = 0;
 	struct strm_res_object *temp_strm_res = NULL;
 
@@ -286,7 +287,7 @@ int drv_proc_insert_strm_res_element(void *hStreamHandle,
 			kfree(*pstrm_res);
 			return -EPERM;
 		}
-		(*pstrm_res)->hstream = hStreamHandle;
+		(*pstrm_res)->hstream = stream_handle;
 		if (ctxt->pstrm_list != NULL) {
 			temp_strm_res = ctxt->pstrm_list;
 			while (temp_strm_res->next != NULL)
@@ -304,10 +305,10 @@ int drv_proc_insert_strm_res_element(void *hStreamHandle,
 /* Release Stream resource element context
 * This function called after the actual resource is freed
  */
-int drv_proc_remove_strm_res_element(void *hstrm_res, void *hPCtxt)
+int drv_proc_remove_strm_res_element(void *hstrm_res, void *process_ctxt)
 {
 	struct strm_res_object *pstrm_res = (struct strm_res_object *)hstrm_res;
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	struct strm_res_object *temp_strm_res;
 	int status = 0;
 
@@ -333,9 +334,9 @@ int drv_proc_remove_strm_res_element(void *hstrm_res, void *hPCtxt)
 /* Release all Stream resources and its context
 * This is called from .bridge_release.
  */
-int drv_remove_all_strm_res_elements(void *hPCtxt)
+int drv_remove_all_strm_res_elements(void *process_ctxt)
 {
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	int status = 0;
 	struct strm_res_object *strm_res = NULL;
 	struct strm_res_object *strm_tmp = NULL;
@@ -375,11 +376,11 @@ int drv_remove_all_strm_res_elements(void *hPCtxt)
 
 /* Getting the stream resource element */
 int drv_get_strm_res_element(void *hStrm, void *hstrm_res,
-				    void *hPCtxt)
+				    void *process_ctxt)
 {
 	struct strm_res_object **strm_res =
 	    (struct strm_res_object **)hstrm_res;
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	int status = 0;
 	struct strm_res_object *temp_strm2 = NULL;
 	struct strm_res_object *temp_strm;
@@ -486,10 +487,10 @@ void drv_exit(void)
  *  purpose:
  *      Invoked during bridge de-initialization
  */
-int drv_destroy(struct drv_object *hDRVObject)
+int drv_destroy(struct drv_object *driver_obj)
 {
 	int status = 0;
-	struct drv_object *pdrv_object = (struct drv_object *)hDRVObject;
+	struct drv_object *pdrv_object = (struct drv_object *)driver_obj;
 
 	DBC_REQUIRE(refs > 0);
 	DBC_REQUIRE(pdrv_object);
@@ -621,19 +622,19 @@ u32 drv_get_next_dev_object(u32 hdev_obj)
  *      called drv_get_first_dev_extension() and zero or more
  *      drv_get_next_dev_extension().
  */
-u32 drv_get_next_dev_extension(u32 hDevExtension)
+u32 drv_get_next_dev_extension(u32 dev_extension)
 {
 	u32 dw_dev_extension = 0;
 	struct drv_object *pdrv_obj;
 
-	DBC_REQUIRE(hDevExtension != 0);
+	DBC_REQUIRE(dev_extension != 0);
 
 	if (DSP_SUCCEEDED(cfg_get_object((u32 *) &pdrv_obj, REG_DRV_OBJECT))) {
 		if ((pdrv_obj->dev_node_string != NULL) &&
 		    !LST_IS_EMPTY(pdrv_obj->dev_node_string)) {
 			dw_dev_extension =
 			    (u32) lst_next(pdrv_obj->dev_node_string,
-					   (struct list_head *)hDevExtension);
+					   (struct list_head *)dev_extension);
 		}
 	}
 
@@ -664,11 +665,11 @@ int drv_init(void)
  *  Purpose:
  *      Insert a DevObject into the list of Manager object.
  */
-int drv_insert_dev_object(struct drv_object *hDRVObject,
+int drv_insert_dev_object(struct drv_object *driver_obj,
 				 struct dev_object *hdev_obj)
 {
 	int status = 0;
-	struct drv_object *pdrv_object = (struct drv_object *)hDRVObject;
+	struct drv_object *pdrv_object = (struct drv_object *)driver_obj;
 
 	DBC_REQUIRE(refs > 0);
 	DBC_REQUIRE(hdev_obj != NULL);
@@ -689,11 +690,11 @@ int drv_insert_dev_object(struct drv_object *hDRVObject,
  *      Search for and remove a DeviceObject from the given list of DRV
  *      objects.
  */
-int drv_remove_dev_object(struct drv_object *hDRVObject,
+int drv_remove_dev_object(struct drv_object *driver_obj,
 				 struct dev_object *hdev_obj)
 {
 	int status = -EPERM;
-	struct drv_object *pdrv_object = (struct drv_object *)hDRVObject;
+	struct drv_object *pdrv_object = (struct drv_object *)driver_obj;
 	struct list_head *cur_elem;
 
 	DBC_REQUIRE(refs > 0);

drivers/staging/tidspbridge/rmgr/drv_interface.c

@@ -628,10 +628,10 @@ static int bridge_mmap(struct file *filp, struct vm_area_struct *vma)
 
 /* To remove all process resources before removing the process from the
  * process context list */
-int drv_remove_all_resources(void *hPCtxt)
+int drv_remove_all_resources(void *process_ctxt)
 {
 	int status = 0;
-	struct process_context *ctxt = (struct process_context *)hPCtxt;
+	struct process_context *ctxt = (struct process_context *)process_ctxt;
 	drv_remove_all_strm_res_elements(ctxt);
 	drv_remove_all_node_res_elements(ctxt);
 	drv_remove_all_dmm_res_elements(ctxt);

drivers/staging/tidspbridge/rmgr/mgr.c

@@ -303,11 +303,11 @@ void mgr_exit(void)
  *  ======== mgr_get_dcd_handle ========
  *      Retrieves the MGR handle. Accessor Function.
  */
-int mgr_get_dcd_handle(struct mgr_object *hMGRHandle,
+int mgr_get_dcd_handle(struct mgr_object *mgr_handle,
 			      OUT u32 *phDCDHandle)
 {
 	int status = -EPERM;
-	struct mgr_object *pmgr_obj = (struct mgr_object *)hMGRHandle;
+	struct mgr_object *pmgr_obj = (struct mgr_object *)mgr_handle;
 
 	DBC_REQUIRE(refs > 0);
 	DBC_REQUIRE(phDCDHandle != NULL);

drivers/staging/tidspbridge/rmgr/nldr.c

@@ -774,14 +774,14 @@ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj,
  *  ======== nldr_get_rmm_manager ========
  *  Given a NLDR object, retrieve RMM Manager Handle
  */
-int nldr_get_rmm_manager(struct nldr_object *hNldrObject,
+int nldr_get_rmm_manager(struct nldr_object *nldr,
 				OUT struct rmm_target_obj **phRmmMgr)
 {
 	int status = 0;
-	struct nldr_object *nldr_obj = hNldrObject;
+	struct nldr_object *nldr_obj = nldr;
 	DBC_REQUIRE(phRmmMgr != NULL);
 
-	if (hNldrObject) {
+	if (nldr) {
 		*phRmmMgr = nldr_obj->rmm;
 	} else {
 		*phRmmMgr = NULL;

drivers/staging/tidspbridge/rmgr/proc.c

@@ -1873,10 +1873,10 @@ static char **prepend_envp(char **new_envp, char **envp, s32 envp_elems,
  *  Purpose:
  *      Notify the processor the events.
  */
-int proc_notify_clients(void *hProc, u32 uEvents)
+int proc_notify_clients(void *proc, u32 uEvents)
 {
 	int status = 0;
-	struct proc_object *p_proc_object = (struct proc_object *)hProc;
+	struct proc_object *p_proc_object = (struct proc_object *)proc;
 
 	DBC_REQUIRE(p_proc_object);
 	DBC_REQUIRE(IS_VALID_PROC_EVENT(uEvents));
@@ -1897,10 +1897,10 @@ int proc_notify_clients(void *hProc, u32 uEvents)
  *      Notify the processor the events. This includes notifying all clients
  *      attached to a particulat DSP.
  */
-int proc_notify_all_clients(void *hProc, u32 uEvents)
+int proc_notify_all_clients(void *proc, u32 uEvents)
 {
 	int status = 0;
-	struct proc_object *p_proc_object = (struct proc_object *)hProc;
+	struct proc_object *p_proc_object = (struct proc_object *)proc;
 
 	DBC_REQUIRE(IS_VALID_PROC_EVENT(uEvents));
 	DBC_REQUIRE(refs > 0);
@@ -1921,10 +1921,10 @@ int proc_notify_all_clients(void *hProc, u32 uEvents)
  *  Purpose:
  *      Retrieves the processor ID.
  */
-int proc_get_processor_id(void *hProc, u32 * procID)
+int proc_get_processor_id(void *proc, u32 * procID)
 {
 	int status = 0;
-	struct proc_object *p_proc_object = (struct proc_object *)hProc;
+	struct proc_object *p_proc_object = (struct proc_object *)proc;
 
 	if (p_proc_object)
 		*procID = p_proc_object->processor_id;