Skip to content

Commit

Permalink
staging: ti dspbridge: Rename words with camel case
Browse files Browse the repository at this point in the history
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:
========================================
pMemStatBuf to mem_stat_buf
pMgrAttrs to mgr_attrts
pMgrInfo to mgr_info
pNodeEnv to node_env
pNodeId to node_uuid
pNodeInfo to node_info
pNumLibs to num_libs
pNumPersLibs to num_pers_libs
pObjDef to obj_def
pObjUuid to obj_uuid
poolPhysBase to pool_phys_base
poolSize to pool_size
pPctxt to pctxt
ppDevContext to dev_cntxt
ppDrvInterface to drv_intf
pPersistentDepLibs to prstnt_dep_libs
pPhyAddr to phy_addr
========================================

Signed-off-by: Rene Sapiens <rene.sapiens@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Rene Sapiens authored and Greg Kroah-Hartman committed Jul 22, 2010
1 parent daa89e6 commit fb6aabb
Show file tree
Hide file tree
Showing 26 changed files with 176 additions and 176 deletions.
28 changes: 14 additions & 14 deletions drivers/staging/tidspbridge/core/chnl_sm.c
Original file line number Diff line number Diff line change
Expand Up @@ -382,37 +382,37 @@ int bridge_chnl_close(struct chnl_object *chnl_obj)
*/
int bridge_chnl_create(OUT struct chnl_mgr **channel_mgr,
struct dev_object *hdev_obj,
IN CONST struct chnl_mgrattrs *pMgrAttrs)
IN CONST struct chnl_mgrattrs *mgr_attrts)
{
int status = 0;
struct chnl_mgr *chnl_mgr_obj = NULL;
u8 max_channels;

/* Check DBC requirements: */
DBC_REQUIRE(channel_mgr != NULL);
DBC_REQUIRE(pMgrAttrs != NULL);
DBC_REQUIRE(pMgrAttrs->max_channels > 0);
DBC_REQUIRE(pMgrAttrs->max_channels <= CHNL_MAXCHANNELS);
DBC_REQUIRE(pMgrAttrs->word_size != 0);
DBC_REQUIRE(mgr_attrts != NULL);
DBC_REQUIRE(mgr_attrts->max_channels > 0);
DBC_REQUIRE(mgr_attrts->max_channels <= CHNL_MAXCHANNELS);
DBC_REQUIRE(mgr_attrts->word_size != 0);

/* Allocate channel manager object */
chnl_mgr_obj = kzalloc(sizeof(struct chnl_mgr), GFP_KERNEL);
if (chnl_mgr_obj) {
/*
* The max_channels attr must equal the # of supported chnls for
* each transport(# chnls for PCPY = DDMA = ZCPY): i.e.
* pMgrAttrs->max_channels = CHNL_MAXCHANNELS =
* mgr_attrts->max_channels = CHNL_MAXCHANNELS =
* DDMA_MAXDDMACHNLS = DDMA_MAXZCPYCHNLS.
*/
DBC_ASSERT(pMgrAttrs->max_channels == CHNL_MAXCHANNELS);
DBC_ASSERT(mgr_attrts->max_channels == CHNL_MAXCHANNELS);
max_channels = CHNL_MAXCHANNELS + CHNL_MAXCHANNELS * CHNL_PCPY;
/* Create array of channels */
chnl_mgr_obj->ap_channel = kzalloc(sizeof(struct chnl_object *)
* max_channels, GFP_KERNEL);
if (chnl_mgr_obj->ap_channel) {
/* Initialize chnl_mgr object */
chnl_mgr_obj->dw_type = CHNL_TYPESM;
chnl_mgr_obj->word_size = pMgrAttrs->word_size;
chnl_mgr_obj->word_size = mgr_attrts->word_size;
/* Total # chnls supported */
chnl_mgr_obj->max_channels = max_channels;
chnl_mgr_obj->open_channels = 0;
Expand Down Expand Up @@ -710,22 +710,22 @@ int bridge_chnl_get_ioc(struct chnl_object *chnl_obj, u32 timeout,
* 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)
OUT struct chnl_mgrinfo *mgr_info)
{
int status = 0;
struct chnl_mgr *chnl_mgr_obj = (struct chnl_mgr *)hchnl_mgr;

if (pMgrInfo != NULL) {
if (mgr_info != NULL) {
if (uChnlID <= CHNL_MAXCHANNELS) {
if (hchnl_mgr) {
/* Return the requested information: */
pMgrInfo->chnl_obj =
mgr_info->chnl_obj =
chnl_mgr_obj->ap_channel[uChnlID];
pMgrInfo->open_channels =
mgr_info->open_channels =
chnl_mgr_obj->open_channels;
pMgrInfo->dw_type = chnl_mgr_obj->dw_type;
mgr_info->dw_type = chnl_mgr_obj->dw_type;
/* total # of chnls */
pMgrInfo->max_channels =
mgr_info->max_channels =
chnl_mgr_obj->max_channels;
} else {
status = -EFAULT;
Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/tidspbridge/core/io_sm.c
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ static int register_shm_segs(struct io_mgr *hio_mgr,
*/
int bridge_io_create(OUT struct io_mgr **io_man,
struct dev_object *hdev_obj,
IN CONST struct io_attrs *pMgrAttrs)
IN CONST struct io_attrs *mgr_attrts)
{
int status = 0;
struct io_mgr *pio_mgr = NULL;
Expand All @@ -174,7 +174,7 @@ int bridge_io_create(OUT struct io_mgr **io_man,
u8 dev_type;

/* Check requirements */
if (!io_man || !pMgrAttrs || pMgrAttrs->word_size == 0) {
if (!io_man || !mgr_attrts || mgr_attrts->word_size == 0) {
status = -EFAULT;
goto func_end;
}
Expand Down Expand Up @@ -214,7 +214,7 @@ int bridge_io_create(OUT struct io_mgr **io_man,
pio_mgr->pmsg = NULL;
#endif
pio_mgr->hchnl_mgr = hchnl_mgr;
pio_mgr->word_size = pMgrAttrs->word_size;
pio_mgr->word_size = mgr_attrts->word_size;
pio_mgr->shared_mem = shared_mem;

if (dev_type == DSP_UNIT) {
Expand All @@ -233,7 +233,7 @@ int bridge_io_create(OUT struct io_mgr **io_man,

if (DSP_SUCCEEDED(status)) {
pio_mgr->hbridge_context = hbridge_context;
pio_mgr->shared_irq = pMgrAttrs->irq_shared;
pio_mgr->shared_irq = mgr_attrts->irq_shared;
if (dsp_wdt_init())
status = -EPERM;
} else {
Expand Down
10 changes: 5 additions & 5 deletions drivers/staging/tidspbridge/core/tiomap3430.c
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ static int bridge_brd_mem_map(struct bridge_dev_context *dev_ctxt,
static int bridge_brd_mem_un_map(struct bridge_dev_context *dev_ctxt,
u32 ulVirtAddr, u32 ul_num_bytes);
static int bridge_dev_create(OUT struct bridge_dev_context
**ppDevContext,
**dev_cntxt,
struct dev_object *hdev_obj,
IN struct cfg_hostres *config_param);
static int bridge_dev_ctrl(struct bridge_dev_context *dev_context,
Expand Down Expand Up @@ -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(OUT struct bridge_drv_interface **drv_intf,
IN CONST char *driver_file_name)
{

Expand All @@ -245,7 +245,7 @@ void bridge_drv_entry(OUT struct bridge_drv_interface **ppDrvInterface,
io_sm_init(); /* Initialization of io_sm module */

if (strcmp(driver_file_name, "UMA") == 0)
*ppDrvInterface = &drv_interface_fxns;
*drv_intf = &drv_interface_fxns;
else
dev_dbg(bridge, "%s Unknown Bridge file name", __func__);

Expand Down Expand Up @@ -792,7 +792,7 @@ static int bridge_brd_write(struct bridge_dev_context *dev_ctxt,
* Creates a driver object. Puts DSP in self loop.
*/
static int bridge_dev_create(OUT struct bridge_dev_context
**ppDevContext,
**dev_cntxt,
struct dev_object *hdev_obj,
IN struct cfg_hostres *config_param)
{
Expand Down Expand Up @@ -930,7 +930,7 @@ static int bridge_dev_create(OUT struct bridge_dev_context
dev_context->dw_brd_state = BRD_STOPPED;
dev_context->resources = resources;
/* Return ptr to our device state to the DSP API for storage */
*ppDevContext = dev_context;
*dev_cntxt = dev_context;
} else {
if (pt_attrs != NULL) {
kfree(pt_attrs->pg_info);
Expand Down
14 changes: 7 additions & 7 deletions drivers/staging/tidspbridge/include/dspbridge/chnl.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ extern int chnl_close(struct chnl_object *chnl_obj);
* Parameters:
* channel_mgr: Location to store a channel manager object on output.
* hdev_obj: Handle to a device object.
* pMgrAttrs: Channel manager attributes.
* pMgrAttrs->max_channels: Max channels
* pMgrAttrs->birq: Channel's I/O IRQ number.
* pMgrAttrs->irq_shared: TRUE if the IRQ is shareable.
* pMgrAttrs->word_size: DSP Word size in equivalent PC bytes..
* mgr_attrts: Channel manager attributes.
* mgr_attrts->max_channels: Max channels
* mgr_attrts->birq: Channel's I/O IRQ number.
* mgr_attrts->irq_shared: TRUE if the IRQ is shareable.
* mgr_attrts->word_size: DSP Word size in equivalent PC bytes..
* Returns:
* 0: Success;
* -EFAULT: hdev_obj is invalid.
Expand All @@ -71,15 +71,15 @@ extern int chnl_close(struct chnl_object *chnl_obj);
* Requires:
* chnl_init(void) called.
* channel_mgr != NULL.
* pMgrAttrs != NULL.
* mgr_attrts != NULL.
* Ensures:
* 0: Subsequent calls to chnl_create() for the same
* board without an intervening call to
* chnl_destroy() will fail.
*/
extern int chnl_create(OUT struct chnl_mgr **channel_mgr,
struct dev_object *hdev_obj,
IN CONST struct chnl_mgrattrs *pMgrAttrs);
IN CONST struct chnl_mgrattrs *mgr_attrts);

/*
* ======== chnl_destroy ========
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/tidspbridge/include/dspbridge/cmm.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ extern void *cmm_calloc_buf(struct cmm_object *hcmm_mgr,
* ph_cmm_mgr: Location to store a communication manager handle on
* output.
* hdev_obj: Handle to a device object.
* pMgrAttrs: Comm mem manager attributes.
* mgr_attrts: Comm mem manager attributes.
* Returns:
* 0: Success;
* -ENOMEM: Insufficient memory for requested resources.
Expand All @@ -81,13 +81,13 @@ extern void *cmm_calloc_buf(struct cmm_object *hcmm_mgr,
* Requires:
* cmm_init(void) called.
* ph_cmm_mgr != NULL.
* pMgrAttrs->ul_min_block_size >= 4 bytes.
* mgr_attrts->ul_min_block_size >= 4 bytes.
* Ensures:
*
*/
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 *mgr_attrts);

/*
* ======== cmm_destroy ========
Expand Down
24 changes: 12 additions & 12 deletions drivers/staging/tidspbridge/include/dspbridge/dbdcd.h
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ extern void dcd_exit(void);
* uuid_obj: Pointer to a dsp_uuid for a library.
* num_libs: Size of uuid array (number of library uuids).
* dep_lib_uuids: Array of dependent library uuids to be filled in.
* pPersistentDepLibs: Array indicating if corresponding lib is persistent.
* prstnt_dep_libs: Array indicating if corresponding lib is persistent.
* phase: phase to obtain correct input library
* Returns:
* 0: Success.
Expand All @@ -173,7 +173,7 @@ extern int dcd_get_dep_libs(IN struct dcd_manager *hdcd_mgr,
IN struct dsp_uuid *uuid_obj,
u16 num_libs,
OUT struct dsp_uuid *dep_lib_uuids,
OUT bool *pPersistentDepLibs,
OUT bool *prstnt_dep_libs,
IN enum nldr_phase phase);

/*
Expand All @@ -184,8 +184,8 @@ extern int dcd_get_dep_libs(IN struct dcd_manager *hdcd_mgr,
* Parameters:
* hdcd_mgr: A DCD manager handle.
* uuid_obj: Pointer to a dsp_uuid for a library.
* pNumLibs: Size of uuid array (number of library uuids).
* pNumPersLibs: number of persistent dependent library.
* num_libs: Size of uuid array (number of library uuids).
* num_pers_libs: number of persistent dependent library.
* phase: Phase to obtain correct input library
* Returns:
* 0: Success.
Expand All @@ -196,13 +196,13 @@ extern int dcd_get_dep_libs(IN struct dcd_manager *hdcd_mgr,
* DCD initialized.
* Valid hdcd_mgr.
* uuid_obj != NULL
* pNumLibs != NULL.
* num_libs != NULL.
* Ensures:
*/
extern int dcd_get_num_dep_libs(IN struct dcd_manager *hdcd_mgr,
IN struct dsp_uuid *uuid_obj,
OUT u16 *pNumLibs,
OUT u16 *pNumPersLibs,
OUT u16 *num_libs,
OUT u16 *num_pers_libs,
IN enum nldr_phase phase);

/*
Expand Down Expand Up @@ -247,7 +247,7 @@ extern int dcd_get_library_name(IN struct dcd_manager *hdcd_mgr,
* DSP/BIOS Bridge object.
* obj_type: The type of DSP/BIOS Bridge object to be
* referenced (node, processor, etc).
* pObjDef: Pointer to an object definition structure. A
* obj_def: Pointer to an object definition structure. A
* union of various possible DCD object types.
* Returns:
* 0: Success.
Expand All @@ -257,14 +257,14 @@ extern int dcd_get_library_name(IN struct dcd_manager *hdcd_mgr,
* -EFAULT: Invalid DCD_HMANAGER handle.
* Requires:
* DCD initialized.
* pObjUuid is non-NULL.
* pObjDef is non-NULL.
* obj_uuid is non-NULL.
* obj_def is non-NULL.
* Ensures:
*/
extern int dcd_get_object_def(IN struct dcd_manager *hdcd_mgr,
IN struct dsp_uuid *pObjUuid,
IN struct dsp_uuid *obj_uuid,
IN enum dsp_dcdobjtype obj_type,
OUT struct dcd_genericobj *pObjDef);
OUT struct dcd_genericobj *obj_def);

/*
* ======== dcd_get_objects ========
Expand Down
6 changes: 3 additions & 3 deletions drivers/staging/tidspbridge/include/dspbridge/disp.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ extern int disp_node_change_priority(struct disp_object
* ul_fxn_addr: Address or RMS create node function.
* ul_create_fxn: Address of node's create function.
* pargs: Arguments to pass to RMS node create function.
* pNodeEnv: Location to store node environment pointer on
* node_env: Location to store node environment pointer on
* output.
* Returns:
* 0: Success.
Expand All @@ -139,7 +139,7 @@ extern int disp_node_change_priority(struct disp_object
* Valid disp_obj.
* pargs != NULL.
* hnode != NULL.
* pNodeEnv != NULL.
* node_env != NULL.
* node_get_type(hnode) != NODE_DEVICE.
* Ensures:
*/
Expand All @@ -148,7 +148,7 @@ extern int disp_node_create(struct disp_object *disp_obj,
u32 ul_fxn_addr,
u32 ul_create_fxn,
IN CONST struct node_createargs
*pargs, OUT nodeenv *pNodeEnv);
*pargs, OUT nodeenv *node_env);

/*
* ======== disp_node_delete ========
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/tidspbridge/include/dspbridge/dmm.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ extern int dmm_delete_tables(struct dmm_object *dmm_mgr);

extern int dmm_create(OUT struct dmm_object **dmm_manager,
struct dev_object *hdev_obj,
IN CONST struct dmm_mgrattrs *pMgrAttrs);
IN CONST struct dmm_mgrattrs *mgr_attrts);

extern bool dmm_init(void);

Expand Down
8 changes: 4 additions & 4 deletions drivers/staging/tidspbridge/include/dspbridge/drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -430,15 +430,15 @@ void bridge_recover_schedule(void);
* allocations.
* physical address based on the page frame address.
* Parameters:
* poolPhysBase starting address of the physical memory pool.
* poolSize size of the physical memory pool.
* pool_phys_base starting address of the physical memory pool.
* pool_size size of the physical memory pool.
* Returns:
* none.
* Requires:
* - 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(IN u32 pool_phys_base, IN u32 pool_size);

/*
* ======== mem_ext_phys_pool_release ========
Expand Down Expand Up @@ -502,7 +502,7 @@ extern void mem_free_phys_mem(void *pVirtualAddress,
* If valid linear address is returned, be sure to call
* MEM_UNMAP_LINEAR_ADDRESS().
*/
#define MEM_LINEAR_ADDRESS(pPhyAddr, byte_size) pPhyAddr
#define MEM_LINEAR_ADDRESS(phy_addr, byte_size) phy_addr

/*
* ======== MEM_UNMAP_LINEAR_ADDRESS ========
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/tidspbridge/include/dspbridge/dspchnl.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
extern int bridge_chnl_create(OUT struct chnl_mgr **channel_mgr,
struct dev_object *hdev_obj,
IN CONST struct chnl_mgrattrs
*pMgrAttrs);
*mgr_attrts);

extern int bridge_chnl_destroy(struct chnl_mgr *hchnl_mgr);

Expand Down Expand Up @@ -58,7 +58,7 @@ extern int bridge_chnl_get_info(struct chnl_object *chnl_obj,

extern int bridge_chnl_get_mgr_info(struct chnl_mgr *hchnl_mgr,
u32 uChnlID, OUT struct chnl_mgrinfo
*pMgrInfo);
*mgr_info);

extern int bridge_chnl_idle(struct chnl_object *chnl_obj,
u32 timeout, bool flush_data);
Expand Down
Loading

0 comments on commit fb6aabb

Please sign in to comment.