---

yaml
---
r: 205862
b: refs/heads/master
c: 13b18c2
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb6aabb7f8b64aef7c4376b6cd4b760a62f75c5b
+refs/heads/master: 13b18c29ec01068dce4b266cc179d4e90e79d0e9

trunk/drivers/staging/tidspbridge/core/io_sm.c

@@ -148,9 +148,9 @@ 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 *dev_ctxt, void *dest,
-		     void *pSrc, u32 usize);
+		     void *src, u32 usize);
 static u32 write_data(struct bridge_dev_context *dev_ctxt, void *dest,
-		      void *pSrc, u32 usize);
+		      void *src, u32 usize);
 
 /* Bus Addr (cached kernel) */
 static int register_shm_segs(struct io_mgr *hio_mgr,
@@ -919,9 +919,9 @@ 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(IN OUT unsigned long ref_data)
 {
-	struct io_mgr *pio_mgr = (struct io_mgr *)pRefData;
+	struct io_mgr *pio_mgr = (struct io_mgr *)ref_data;
 	struct chnl_mgr *chnl_mgr_obj;
 	struct msg_mgr *msg_mgr_obj;
 	struct deh_mgr *hdeh_mgr;
@@ -1702,9 +1702,9 @@ static int register_shm_segs(struct io_mgr *hio_mgr,
  *      Copies buffers from the shared memory to the host buffer.
  */
 static u32 read_data(struct bridge_dev_context *dev_ctxt, void *dest,
-		     void *pSrc, u32 usize)
+		     void *src, u32 usize)
 {
-	memcpy(dest, pSrc, usize);
+	memcpy(dest, src, usize);
 	return usize;
 }
 
@@ -1713,9 +1713,9 @@ static u32 read_data(struct bridge_dev_context *dev_ctxt, void *dest,
  *      Copies buffers from the host side buffer to the shared memory.
  */
 static u32 write_data(struct bridge_dev_context *dev_ctxt, void *dest,
-		      void *pSrc, u32 usize)
+		      void *src, u32 usize)
 {
-	memcpy(dest, pSrc, usize);
+	memcpy(dest, src, usize);
 	return usize;
 }
 
@@ -1793,20 +1793,21 @@ 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(IN struct io_mgr *hio_mgr,
-				OUT struct dsp_procloadstat *pProcStat)
+				OUT struct dsp_procloadstat *proc_lstat)
 {
-	pProcStat->curr_load = hio_mgr->shared_mem->load_mon_info.curr_dsp_load;
-	pProcStat->predicted_load =
+	proc_lstat->curr_load =
+			hio_mgr->shared_mem->load_mon_info.curr_dsp_load;
+	proc_lstat->predicted_load =
 	    hio_mgr->shared_mem->load_mon_info.pred_dsp_load;
-	pProcStat->curr_dsp_freq =
+	proc_lstat->curr_dsp_freq =
 	    hio_mgr->shared_mem->load_mon_info.curr_dsp_freq;
-	pProcStat->predicted_freq =
+	proc_lstat->predicted_freq =
 	    hio_mgr->shared_mem->load_mon_info.pred_dsp_freq;
 
 	dev_dbg(bridge, "Curr Load = %d, Pred Load = %d, Curr Freq = %d, "
-		"Pred Freq = %d\n", pProcStat->curr_load,
-		pProcStat->predicted_load, pProcStat->curr_dsp_freq,
-		pProcStat->predicted_freq);
+		"Pred Freq = %d\n", proc_lstat->curr_load,
+		proc_lstat->predicted_load, proc_lstat->curr_dsp_freq,
+		proc_lstat->predicted_freq);
 	return 0;
 }
 

trunk/drivers/staging/tidspbridge/hw/hw_mmu.c

@@ -85,7 +85,7 @@ static hw_status mmu_flush_entry(const void __iomem *base_address);
  *       TypE		: const u32
  *       Description     : It indicates the page size
  *
- *       Identifier      : preservedBit
+ *       Identifier      : preserved_bit
  *       Type		: const u32
  *       Description     : It indicates the TLB entry is preserved entry
  *							or not
@@ -114,7 +114,7 @@ static hw_status mmu_flush_entry(const void __iomem *base_address);
  */
 static hw_status mmu_set_cam_entry(const void __iomem *base_address,
 				   const u32 page_sz,
-				   const u32 preservedBit,
+				   const u32 preserved_bit,
 				   const u32 validBit,
 				   const u32 virtual_addr_tag);
 
@@ -337,7 +337,7 @@ hw_status hw_mmu_tlb_add(const void __iomem *base_address,
 			 u32 page_sz,
 			 u32 entry_num,
 			 struct hw_mmu_map_attrs_t *map_attrs,
-			 s8 preservedBit, s8 validBit)
+			 s8 preserved_bit, s8 validBit)
 {
 	hw_status status = RET_OK;
 	u32 lock_reg;
@@ -380,7 +380,7 @@ hw_status hw_mmu_tlb_add(const void __iomem *base_address,
 	virtual_addr_tag = ((virtualAddr & MMU_ADDR_MASK) >> 12);
 
 	/* Write the fields in the CAM Entry Register */
-	mmu_set_cam_entry(base_address, mmu_pg_size, preservedBit, validBit,
+	mmu_set_cam_entry(base_address, mmu_pg_size, preserved_bit, validBit,
 			  virtual_addr_tag);
 
 	/* Write the different fields of the RAM Entry Register */
@@ -538,7 +538,7 @@ static hw_status mmu_flush_entry(const void __iomem *base_address)
 /* mmu_set_cam_entry */
 static hw_status mmu_set_cam_entry(const void __iomem *base_address,
 				   const u32 page_sz,
-				   const u32 preservedBit,
+				   const u32 preserved_bit,
 				   const u32 validBit,
 				   const u32 virtual_addr_tag)
 {
@@ -551,7 +551,7 @@ static hw_status mmu_set_cam_entry(const void __iomem *base_address,
 
 	mmu_cam_reg = (virtual_addr_tag << 12);
 	mmu_cam_reg = (mmu_cam_reg) | (page_sz) | (validBit << 2) |
-	    (preservedBit << 3);
+	    (preserved_bit << 3);
 
 	/* write values to register */
 	MMUMMU_CAM_WRITE_REGISTER32(base_address, mmu_cam_reg);

trunk/drivers/staging/tidspbridge/hw/hw_mmu.h

@@ -85,7 +85,7 @@ extern hw_status hw_mmu_tlb_add(const void __iomem *base_address,
 				u32 page_sz,
 				u32 entry_num,
 				struct hw_mmu_map_attrs_t *map_attrs,
-				s8 preservedBit, s8 validBit);
+				s8 preserved_bit, s8 validBit);
 
 /* For PTEs */
 extern hw_status hw_mmu_pte_set(const u32 pg_tbl_va,

trunk/drivers/staging/tidspbridge/include/dspbridge/cfg.h

@@ -100,20 +100,20 @@ extern int cfg_get_dev_object(IN struct cfg_devnode *dev_node_obj,
  *  Parameters:
  *      dev_node_obj: Handle to the dev_node who's driver we are querying.
  *      buf_size:       Size of buffer.
- *      pstrExecFile:   Ptr to character buf to hold ExecFile.
+ *      str_exec_file:  Ptr to character buf to hold ExecFile.
  *  Returns:
  *      0:                Success.
- *      -EFAULT:  dev_node_obj is invalid or pstrExecFile is invalid.
+ *      -EFAULT:  dev_node_obj is invalid or str_exec_file is invalid.
  *      -ENODATA: The resource is not available.
  *  Requires:
  *      CFG initialized.
  *  Ensures:
- *      0:    Not more than buf_size bytes were copied into pstrExecFile,
- *                  and *pstrExecFile contains default executable for this
+ *      0:    Not more than buf_size bytes were copied into str_exec_file,
+ *                  and *str_exec_file 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);
+				    IN u32 buf_size, OUT char *str_exec_file);
 
 /*
  *  ======== cfg_get_object ========

trunk/drivers/staging/tidspbridge/include/dspbridge/cod.h

@@ -350,20 +350,20 @@ extern int cod_open_base(struct cod_manager *hmgr, IN char *pszCoffPath,
  *  Parameters:
  *      cod_mgr_obj    - manager in which to search for the symbol
  *      pstrSect    - name of the section, with or without leading "."
- *      pstrContent - buffer to store content of the section.
+ *      str_content - buffer to store content of the section.
  *  Returns:
  *      0: on success, error code on failure
  *      -ESPIPE:  Symbols have not been loaded onto the board.
  *  Requires:
  *      COD module initialized.
  *      valid cod_mgr_obj.
  *      pstrSect != NULL;
- *      pstrContent != NULL;
+ *      str_content != NULL;
  *  Ensures:
- *      0:  *pstrContent stores the content of the named section.
+ *      0:  *str_content 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);
+				   OUT char *str_content, IN u32 content_size);
 
 #endif /* COD_ */

trunk/drivers/staging/tidspbridge/include/dspbridge/dbll.h

@@ -31,11 +31,11 @@ extern int dbll_create(struct dbll_tar_obj **target_obj,
 extern void dbll_delete(struct dbll_tar_obj *target);
 extern void dbll_exit(void);
 extern bool dbll_get_addr(struct dbll_library_obj *lib, char *name,
-			  struct dbll_sym_val **ppSym);
+			  struct dbll_sym_val **sym_val);
 extern void dbll_get_attrs(struct dbll_tar_obj *target,
 			   struct dbll_attrs *pattrs);
 extern bool dbll_get_c_addr(struct dbll_library_obj *lib, char *name,
-			    struct dbll_sym_val **ppSym);
+			    struct dbll_sym_val **sym_val);
 extern int dbll_get_sect(struct dbll_library_obj *lib, char *name,
 				u32 *paddr, u32 *psize);
 extern bool dbll_init(void);

trunk/drivers/staging/tidspbridge/include/dspbridge/dblldefs.h

@@ -239,19 +239,19 @@ typedef void (*dbll_exit_fxn) (void);
  *  Parameters:
  *      lib             - Handle returned from dbll_open().
  *      name            - Name of symbol
- *      ppSym           - Location to store symbol address on output.
+ *      sym_val         - Location to store symbol address on output.
  *  Returns:
  *      TRUE:           Success.
  *      FALSE:          Symbol not found.
  *  Requires:
  *      DBL initialized.
  *      Valid library.
  *      name != NULL.
- *      ppSym != NULL.
+ *      sym_val != NULL.
  *  Ensures:
  */
 typedef bool(*dbll_get_addr_fxn) (struct dbll_library_obj *lib, char *name,
-				  struct dbll_sym_val **ppSym);
+				  struct dbll_sym_val **sym_val);
 
 /*
  *  ======== dbll_get_attrs ========
@@ -275,19 +275,19 @@ typedef void (*dbll_get_attrs_fxn) (struct dbll_tar_obj *target,
  *  Parameters:
  *      lib             - Handle returned from dbll_open().
  *      name            - Name of symbol
- *      ppSym           - Location to store symbol address on output.
+ *      sym_val         - Location to store symbol address on output.
  *  Returns:
  *      TRUE:           Success.
  *      FALSE:          Symbol not found.
  *  Requires:
  *      DBL initialized.
  *      Valid target.
  *      name != NULL.
- *      ppSym != NULL.
+ *      sym_val != NULL.
  *  Ensures:
  */
 typedef bool(*dbll_get_c_addr_fxn) (struct dbll_library_obj *lib, char *name,
-				    struct dbll_sym_val **ppSym);
+				    struct dbll_sym_val **sym_val);
 
 /*
  *  ======== dbll_get_sect ========

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

@@ -367,20 +367,20 @@ extern struct dev_object *dev_get_first(void);
  *  Parameters:
  *      hdev_obj:     Handle to device object created with
  *                      dev_create_device().
- *      *ppIntfFxns:    Ptr to location to store fxn interface.
+ *      *if_fxns:       Ptr to location to store fxn interface.
  *  Returns:
  *      0:        Success.
  *      -EFAULT:    Invalid hdev_obj.
  *  Requires:
- *      ppIntfFxns != NULL.
+ *      if_fxns != NULL.
  *      DEV Initialized.
  *  Ensures:
- *      0:        *ppIntfFxns contains a pointer to the Bridge
+ *      0:        *if_fxns contains a pointer to the Bridge
  *                      driver interface;
- *      else:           *ppIntfFxns is NULL.
+ *      else:           *if_fxns is NULL.
  */
 extern int dev_get_intf_fxns(struct dev_object *hdev_obj,
-			    OUT struct bridge_drv_interface **ppIntfFxns);
+			    OUT struct bridge_drv_interface **if_fxns);
 
 /*
  *  ======== dev_get_io_mgr ========

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

@@ -451,7 +451,7 @@ extern void mem_ext_phys_pool_release(void);
  *  Parameters:
  *      byte_size:     Number of bytes to allocate.
  *      ulAlign:    Alignment Mask.
- *      pPhysicalAddress: Physical address of allocated memory.
+ *      physical_address: Physical address of allocated memory.
  *  Returns:
  *      Pointer to a block of memory;
  *      NULL if memory couldn't be allocated, or if byte_size == 0.
@@ -463,7 +463,7 @@ extern void mem_ext_phys_pool_release(void);
  *      location of memory.
  */
 extern void *mem_alloc_phys_mem(IN u32 byte_size,
-				IN u32 ulAlign, OUT u32 *pPhysicalAddress);
+				IN u32 ulAlign, OUT u32 *physical_address);
 
 /*
  *  ======== mem_free_phys_mem ========
@@ -472,7 +472,7 @@ extern void *mem_alloc_phys_mem(IN u32 byte_size,
  *  Parameters:
  *      pVirtualAddress:  Pointer to virtual memory region allocated
  *      by mem_alloc_phys_mem().
- *      pPhysicalAddress:  Pointer to physical memory region  allocated
+ *      physical_address:  Pointer to physical memory region  allocated
  *      by mem_alloc_phys_mem().
  *      byte_size:  Size of the memory region allocated by mem_alloc_phys_mem().
  *  Returns:
@@ -484,14 +484,14 @@ extern void *mem_alloc_phys_mem(IN u32 byte_size,
  *      pVirtualAddress is no longer a valid pointer to memory.
  */
 extern void mem_free_phys_mem(void *pVirtualAddress,
-			      u32 pPhysicalAddress, u32 byte_size);
+			      u32 physical_address, u32 byte_size);
 
 /*
  *  ======== MEM_LINEAR_ADDRESS ========
  *  Purpose:
  *      Get the linear address corresponding to the given physical address.
  *  Parameters:
- *      pPhysAddr:  Physical address to be mapped.
+ *      phys_addr:  Physical address to be mapped.
  *      byte_size:     Number of bytes in physical range to map.
  *  Returns:
  *      The corresponding linear address, or NULL if unsuccessful.

trunk/drivers/staging/tidspbridge/include/dspbridge/dspapi.h

@@ -42,7 +42,7 @@
  *  Parameters:
  *      cmd:        IOCTL id, base 0.
  *      args:       Argument structure.
- *      pResult:
+ *      result:
  *  Returns:
  *      0 if command called; -EINVAL if command not in IOCTL
  *      table.
@@ -51,7 +51,7 @@
  */
 extern int api_call_dev_ioctl(unsigned int cmd,
 				      union Trapped_Args *args,
-				      u32 *pResult, void *pr_ctxt);
+				      u32 *result, void *pr_ctxt);
 
 /*
  *  ======== api_init ========

trunk/drivers/staging/tidspbridge/include/dspbridge/dspdefs.h

@@ -787,7 +787,7 @@ typedef int(*fxn_io_onloaded) (struct io_mgr *hio_mgr);
  *      Called to get the Processor's current and predicted load
  *  Parameters:
  *      hio_mgr:     IO Manager.
- *      pProcLoadStat   Processor Load statistics
+ *      proc_load_stat   Processor Load statistics
  *  Returns:
  *      0:    Success.
  *      -EPERM:  Internal failure occurred.
@@ -797,7 +797,7 @@ typedef int(*fxn_io_onloaded) (struct io_mgr *hio_mgr);
  */
 typedef int(*fxn_io_getprocload) (struct io_mgr *hio_mgr,
 					 struct dsp_procloadstat *
-					 pProcLoadStat);
+					 proc_load_stat);
 
 /*
  *  ======== bridge_msg_create ========

trunk/drivers/staging/tidspbridge/include/dspbridge/dspio.h

@@ -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(IN struct io_mgr *hio_mgr,
-				       OUT struct dsp_procloadstat *pProcStat);
+				       OUT struct dsp_procloadstat *proc_lstat);
 
 #endif /* DSPIO_ */

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

@@ -68,7 +68,7 @@ extern void io_cancel_chnl(struct io_mgr *hio_mgr, u32 ulChnl);
  *      Deferred procedure call for shared memory channel driver ISR.  Carries
  *      out the dispatch of I/O.
  *  Parameters:
- *      pRefData:   Pointer to reference data registered via a call to
+ *      ref_data:   Pointer to reference data registered via a call to
  *                  DPC_Create().
  *  Returns:
  *  Requires:
@@ -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(IN OUT unsigned long ref_data);
 
 /*
  *  ======== io_mbox_msg ========
@@ -87,7 +87,7 @@ extern void io_dpc(IN OUT unsigned long pRefData);
  *      Calls the Bridge's chnlsm_isr to determine if this interrupt is ours,
  *      then schedules a DPC to dispatch I/O.
  *  Parameters:
- *      pRefData:   Pointer to the channel manager object for this board.
+ *      ref_data:   Pointer to the channel manager object for this board.
  *                  Set in an initial call to ISR_Install().
  *  Returns:
  *      TRUE if interrupt handled; FALSE otherwise.