diff options
author | Rene Sapiens <rene.sapiens@ti.com> | 2010-07-09 21:24:04 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 10:45:36 -0700 |
commit | 383b834522b11eec607dbe422835dcf5812730c3 (patch) | |
tree | 195f0be11cc94701884e34485d5111c3770f373f /drivers/staging/tidspbridge/rmgr | |
parent | staging: ti dspbridge: Rename words with camel case. (diff) | |
download | linux-dev-383b834522b11eec607dbe422835dcf5812730c3.tar.xz linux-dev-383b834522b11eec607dbe422835dcf5812730c3.zip |
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:
========================================
pstrFxn to str_fxn
pstrLibName to str_lib_name
pstrSect to str_sect
pstrSym to str_sym
pstrZLFileName to str_zl_file_name
pstrZLFile to str_zl_file
pszCoffPath to sz_coff_path
pszMode to sz_mode
pszName to sz_name
pszSectName to sz_sect_name
pszUuid to sz_uuid
pszZlDllName to sz_zl_dll_name
puAddr to addr
pulAddr to addr
pulBufSize to buff_size
pulBytes to nbytes
========================================
Signed-off-by: Rene Sapiens <rene.sapiens@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/tidspbridge/rmgr')
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/dbdcd.c | 32 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/nldr.c | 20 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/strm.c | 14 |
3 files changed, 33 insertions, 33 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c index 2f32ece4a4c8..a5cef434f4b1 100644 --- a/drivers/staging/tidspbridge/rmgr/dbdcd.c +++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c @@ -81,16 +81,16 @@ static int get_dep_lib_info(IN struct dcd_manager *hdcd_mgr, * Parses the supplied image and resigsters with DCD. */ int dcd_auto_register(IN struct dcd_manager *hdcd_mgr, - IN char *pszCoffPath) + IN char *sz_coff_path) { int status = 0; DBC_REQUIRE(refs > 0); if (hdcd_mgr) - status = dcd_get_objects(hdcd_mgr, pszCoffPath, + status = dcd_get_objects(hdcd_mgr, sz_coff_path, (dcd_registerfxn) dcd_register_object, - (void *)pszCoffPath); + (void *)sz_coff_path); else status = -EFAULT; @@ -103,14 +103,14 @@ int dcd_auto_register(IN struct dcd_manager *hdcd_mgr, * Parses the supplied DSP image and unresiters from DCD. */ int dcd_auto_unregister(IN struct dcd_manager *hdcd_mgr, - IN char *pszCoffPath) + IN char *sz_coff_path) { int status = 0; DBC_REQUIRE(refs > 0); if (hdcd_mgr) - status = dcd_get_objects(hdcd_mgr, pszCoffPath, + status = dcd_get_objects(hdcd_mgr, sz_coff_path, (dcd_registerfxn) dcd_register_object, NULL); else @@ -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(IN char *sz_zl_dll_name, OUT struct dcd_manager **dcd_mgr) { struct cod_manager *cod_mgr; /* COD manager handle */ @@ -134,7 +134,7 @@ int dcd_create_manager(IN char *pszZlDllName, DBC_REQUIRE(refs >= 0); DBC_REQUIRE(dcd_mgr); - status = cod_create(&cod_mgr, pszZlDllName, NULL); + status = cod_create(&cod_mgr, sz_zl_dll_name, NULL); if (DSP_FAILED(status)) goto func_end; @@ -534,7 +534,7 @@ func_end: * ======== dcd_get_objects ======== */ int dcd_get_objects(IN struct dcd_manager *hdcd_mgr, - IN char *pszCoffPath, dcd_registerfxn registerFxn, + IN char *sz_coff_path, dcd_registerfxn registerFxn, void *handle) { struct dcd_manager *dcd_mgr_obj = hdcd_mgr; @@ -556,7 +556,7 @@ int dcd_get_objects(IN struct dcd_manager *hdcd_mgr, } /* Open DSP coff file, don't load symbols. */ - status = cod_open(dcd_mgr_obj->cod_mgr, pszCoffPath, COD_NOLOAD, &lib); + status = cod_open(dcd_mgr_obj->cod_mgr, sz_coff_path, COD_NOLOAD, &lib); if (DSP_FAILED(status)) { status = -EACCES; goto func_cont; @@ -572,7 +572,7 @@ int dcd_get_objects(IN struct dcd_manager *hdcd_mgr, /* Allocate zeroed buffer. */ psz_coff_buf = kzalloc(ul_len + 4, GFP_KERNEL); #ifdef _DB_TIOMAP - if (strstr(pszCoffPath, "iva") == NULL) { + if (strstr(sz_coff_path, "iva") == NULL) { /* Locate section by objectID and read its content. */ status = cod_read_section(lib, DCD_REGISTER_SECTION, psz_coff_buf, ul_len); @@ -587,7 +587,7 @@ int dcd_get_objects(IN struct dcd_manager *hdcd_mgr, #endif if (DSP_SUCCEEDED(status)) { /* Compress DSP buffer to conform to PC format. */ - if (strstr(pszCoffPath, "iva") == NULL) { + if (strstr(sz_coff_path, "iva") == NULL) { compress_buf(psz_coff_buf, ul_len, DSPWORDSIZE); } else { compress_buf(psz_coff_buf, ul_len, 1); @@ -644,7 +644,7 @@ func_end: */ int dcd_get_library_name(IN struct dcd_manager *hdcd_mgr, IN struct dsp_uuid *uuid_obj, - IN OUT char *pstrLibName, + IN OUT char *str_lib_name, IN OUT u32 *buff_size, enum nldr_phase phase, OUT bool *phase_split) { @@ -656,12 +656,12 @@ int dcd_get_library_name(IN struct dcd_manager *hdcd_mgr, struct dcd_key_elem *dcd_key = NULL; DBC_REQUIRE(uuid_obj != NULL); - DBC_REQUIRE(pstrLibName != NULL); + DBC_REQUIRE(str_lib_name != NULL); DBC_REQUIRE(buff_size != NULL); DBC_REQUIRE(hdcd_mgr); - dev_dbg(bridge, "%s: hdcd_mgr %p, uuid_obj %p, pstrLibName %p," - " buff_size %p\n", __func__, hdcd_mgr, uuid_obj, pstrLibName, + dev_dbg(bridge, "%s: hdcd_mgr %p, uuid_obj %p, str_lib_name %p," + " buff_size %p\n", __func__, hdcd_mgr, uuid_obj, str_lib_name, buff_size); /* @@ -768,7 +768,7 @@ int dcd_get_library_name(IN struct dcd_manager *hdcd_mgr, } if (DSP_SUCCEEDED(status)) - memcpy(pstrLibName, dcd_key->path, strlen(dcd_key->path) + 1); + memcpy(str_lib_name, dcd_key->path, strlen(dcd_key->path) + 1); return status; } diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c index 0c8a16567f07..3eb1ae3c9bf3 100644 --- a/drivers/staging/tidspbridge/rmgr/nldr.c +++ b/drivers/staging/tidspbridge/rmgr/nldr.c @@ -682,7 +682,7 @@ void nldr_exit(void) * ======== nldr_get_fxn_addr ======== */ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, - char *pstrFxn, u32 * pulAddr) + char *str_fxn, u32 * addr) { struct dbll_sym_val *dbll_sym; struct nldr_object *nldr_obj; @@ -692,8 +692,8 @@ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, struct lib_node root = { NULL, 0, NULL }; DBC_REQUIRE(refs > 0); DBC_REQUIRE(nldr_node_obj); - DBC_REQUIRE(pulAddr != NULL); - DBC_REQUIRE(pstrFxn != NULL); + DBC_REQUIRE(addr != NULL); + DBC_REQUIRE(str_fxn != NULL); nldr_obj = nldr_node_obj->nldr_obj; /* Called from node_create(), node_delete(), or node_run(). */ @@ -717,10 +717,10 @@ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, root = nldr_node_obj->root; } status1 = - nldr_obj->ldr_fxns.get_c_addr_fxn(root.lib, pstrFxn, &dbll_sym); + nldr_obj->ldr_fxns.get_c_addr_fxn(root.lib, str_fxn, &dbll_sym); if (!status1) status1 = - nldr_obj->ldr_fxns.get_addr_fxn(root.lib, pstrFxn, + nldr_obj->ldr_fxns.get_addr_fxn(root.lib, str_fxn, &dbll_sym); /* If symbol not found, check dependent libraries */ @@ -728,13 +728,13 @@ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, for (i = 0; i < root.dep_libs; i++) { status1 = nldr_obj->ldr_fxns.get_addr_fxn(root.dep_libs_tree - [i].lib, pstrFxn, + [i].lib, str_fxn, &dbll_sym); if (!status1) { status1 = nldr_obj->ldr_fxns. get_c_addr_fxn(root.dep_libs_tree[i].lib, - pstrFxn, &dbll_sym); + str_fxn, &dbll_sym); } if (status1) { /* Symbol found */ @@ -748,12 +748,12 @@ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, status1 = nldr_obj->ldr_fxns. get_addr_fxn(nldr_node_obj->pers_lib_table[i].lib, - pstrFxn, &dbll_sym); + str_fxn, &dbll_sym); if (!status1) { status1 = nldr_obj->ldr_fxns. get_c_addr_fxn(nldr_node_obj->pers_lib_table - [i].lib, pstrFxn, &dbll_sym); + [i].lib, str_fxn, &dbll_sym); } if (status1) { /* Symbol found */ @@ -763,7 +763,7 @@ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, } if (status1) - *pulAddr = dbll_sym->value; + *addr = dbll_sym->value; else status = -ESPIPE; diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c index f6922f485037..ad3b50cd32cf 100644 --- a/drivers/staging/tidspbridge/rmgr/strm.c +++ b/drivers/staging/tidspbridge/rmgr/strm.c @@ -620,7 +620,7 @@ func_cont: * Relcaims a buffer from a stream. */ int strm_reclaim(struct strm_object *stream_obj, OUT u8 ** buf_ptr, - u32 *pulBytes, u32 *pulBufSize, u32 *pdw_arg) + u32 *nbytes, u32 *buff_size, u32 *pdw_arg) { struct bridge_drv_interface *intf_fxns; struct chnl_ioc chnl_ioc_obj; @@ -629,7 +629,7 @@ int strm_reclaim(struct strm_object *stream_obj, OUT u8 ** buf_ptr, DBC_REQUIRE(refs > 0); DBC_REQUIRE(buf_ptr != NULL); - DBC_REQUIRE(pulBytes != NULL); + DBC_REQUIRE(nbytes != NULL); DBC_REQUIRE(pdw_arg != NULL); if (!stream_obj) { @@ -643,9 +643,9 @@ int strm_reclaim(struct strm_object *stream_obj, OUT u8 ** buf_ptr, stream_obj->utimeout, &chnl_ioc_obj); if (DSP_SUCCEEDED(status)) { - *pulBytes = chnl_ioc_obj.byte_size; - if (pulBufSize) - *pulBufSize = chnl_ioc_obj.buf_size; + *nbytes = chnl_ioc_obj.byte_size; + if (buff_size) + *buff_size = chnl_ioc_obj.buf_size; *pdw_arg = chnl_ioc_obj.dw_arg; if (!CHNL_IS_IO_COMPLETE(chnl_ioc_obj)) { @@ -692,9 +692,9 @@ func_end: status == -ETIME || status == -ESRCH || status == -EPERM); - dev_dbg(bridge, "%s: stream_obj: %p buf_ptr: %p pulBytes: %p " + dev_dbg(bridge, "%s: stream_obj: %p buf_ptr: %p nbytes: %p " "pdw_arg: %p status 0x%x\n", __func__, stream_obj, - buf_ptr, pulBytes, pdw_arg, status); + buf_ptr, nbytes, pdw_arg, status); return status; } |