aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/tidspbridge/pmgr
diff options
context:
space:
mode:
authorRene Sapiens <rene.sapiens@ti.com>2010-07-09 22:24:05 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-07-22 13:45:36 -0400
commit318b5df99bbbe58eb9f80105d9534117ac2f25ce (patch)
tree23c80582ef2cedb12eee0f8ac521745ec2d5f266 /drivers/staging/tidspbridge/pmgr
parent383b834522b11eec607dbe422835dcf5812730c3 (diff)
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: ======================================== puLen to len pulEntry to entry_pt pulFxnAddr to fxn_addr pulId to chan_id pulSegId to sgmt_id pVaBuf to va_buf pVirtualAddress to virtual_address pwMbVal to mbx_val pWord to word pXlatorAttrs to xlator_attrs registerFxn to register_fxn rootPersistent to root_prstnt sectionData to section_data sectionInfo to section_info sectionName to section_name sectName to sec_name ======================================== Signed-off-by: Rene Sapiens <rene.sapiens@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/tidspbridge/pmgr')
-rw-r--r--drivers/staging/tidspbridge/pmgr/cmm.c22
-rw-r--r--drivers/staging/tidspbridge/pmgr/cod.c16
-rw-r--r--drivers/staging/tidspbridge/pmgr/dbll.c6
3 files changed, 22 insertions, 22 deletions
diff --git a/drivers/staging/tidspbridge/pmgr/cmm.c b/drivers/staging/tidspbridge/pmgr/cmm.c
index 8fd9c2685c4..0a360857e75 100644
--- a/drivers/staging/tidspbridge/pmgr/cmm.c
+++ b/drivers/staging/tidspbridge/pmgr/cmm.c
@@ -540,7 +540,7 @@ int cmm_register_gppsm_seg(struct cmm_object *hcmm_mgr,
540 u32 dw_gpp_base_pa, u32 ul_size, 540 u32 dw_gpp_base_pa, u32 ul_size,
541 u32 dsp_addr_offset, s8 c_factor, 541 u32 dsp_addr_offset, s8 c_factor,
542 u32 dw_dsp_base, u32 ul_dsp_size, 542 u32 dw_dsp_base, u32 ul_dsp_size,
543 u32 *pulSegId, u32 dw_gpp_base_va) 543 u32 *sgmt_id, u32 dw_gpp_base_va)
544{ 544{
545 struct cmm_object *cmm_mgr_obj = (struct cmm_object *)hcmm_mgr; 545 struct cmm_object *cmm_mgr_obj = (struct cmm_object *)hcmm_mgr;
546 struct cmm_allocator *psma = NULL; 546 struct cmm_allocator *psma = NULL;
@@ -549,7 +549,7 @@ int cmm_register_gppsm_seg(struct cmm_object *hcmm_mgr,
549 s32 slot_seg; 549 s32 slot_seg;
550 550
551 DBC_REQUIRE(ul_size > 0); 551 DBC_REQUIRE(ul_size > 0);
552 DBC_REQUIRE(pulSegId != NULL); 552 DBC_REQUIRE(sgmt_id != NULL);
553 DBC_REQUIRE(dw_gpp_base_pa != 0); 553 DBC_REQUIRE(dw_gpp_base_pa != 0);
554 DBC_REQUIRE(dw_gpp_base_va != 0); 554 DBC_REQUIRE(dw_gpp_base_va != 0);
555 DBC_REQUIRE((c_factor <= CMM_ADDTODSPPA) && 555 DBC_REQUIRE((c_factor <= CMM_ADDTODSPPA) &&
@@ -596,7 +596,7 @@ int cmm_register_gppsm_seg(struct cmm_object *hcmm_mgr,
596 } 596 }
597 if (DSP_SUCCEEDED(status)) { 597 if (DSP_SUCCEEDED(status)) {
598 /* return the actual segment identifier */ 598 /* return the actual segment identifier */
599 *pulSegId = (u32) slot_seg + 1; 599 *sgmt_id = (u32) slot_seg + 1;
600 /* create memory free list */ 600 /* create memory free list */
601 psma->free_list_head = kzalloc(sizeof(struct lst_list), 601 psma->free_list_head = kzalloc(sizeof(struct lst_list),
602 GFP_KERNEL); 602 GFP_KERNEL);
@@ -956,7 +956,7 @@ static struct cmm_allocator *get_allocator(struct cmm_object *cmm_mgr_obj,
956 */ 956 */
957int cmm_xlator_create(OUT struct cmm_xlatorobject **xlator, 957int cmm_xlator_create(OUT struct cmm_xlatorobject **xlator,
958 struct cmm_object *hcmm_mgr, 958 struct cmm_object *hcmm_mgr,
959 struct cmm_xlatorattrs *pXlatorAttrs) 959 struct cmm_xlatorattrs *xlator_attrs)
960{ 960{
961 struct cmm_xlator *xlator_object = NULL; 961 struct cmm_xlator *xlator_object = NULL;
962 int status = 0; 962 int status = 0;
@@ -966,14 +966,14 @@ int cmm_xlator_create(OUT struct cmm_xlatorobject **xlator,
966 DBC_REQUIRE(hcmm_mgr != NULL); 966 DBC_REQUIRE(hcmm_mgr != NULL);
967 967
968 *xlator = NULL; 968 *xlator = NULL;
969 if (pXlatorAttrs == NULL) 969 if (xlator_attrs == NULL)
970 pXlatorAttrs = &cmm_dfltxlatorattrs; /* set defaults */ 970 xlator_attrs = &cmm_dfltxlatorattrs; /* set defaults */
971 971
972 xlator_object = kzalloc(sizeof(struct cmm_xlator), GFP_KERNEL); 972 xlator_object = kzalloc(sizeof(struct cmm_xlator), GFP_KERNEL);
973 if (xlator_object != NULL) { 973 if (xlator_object != NULL) {
974 xlator_object->hcmm_mgr = hcmm_mgr; /* ref back to CMM */ 974 xlator_object->hcmm_mgr = hcmm_mgr; /* ref back to CMM */
975 /* SM seg_id */ 975 /* SM seg_id */
976 xlator_object->ul_seg_id = pXlatorAttrs->ul_seg_id; 976 xlator_object->ul_seg_id = xlator_attrs->ul_seg_id;
977 } else { 977 } else {
978 status = -ENOMEM; 978 status = -ENOMEM;
979 } 979 }
@@ -1007,7 +1007,7 @@ int cmm_xlator_delete(struct cmm_xlatorobject *xlator, bool force)
1007/* 1007/*
1008 * ======== cmm_xlator_alloc_buf ======== 1008 * ======== cmm_xlator_alloc_buf ========
1009 */ 1009 */
1010void *cmm_xlator_alloc_buf(struct cmm_xlatorobject *xlator, void *pVaBuf, 1010void *cmm_xlator_alloc_buf(struct cmm_xlatorobject *xlator, void *va_buf,
1011 u32 uPaSize) 1011 u32 uPaSize)
1012{ 1012{
1013 struct cmm_xlator *xlator_obj = (struct cmm_xlator *)xlator; 1013 struct cmm_xlator *xlator_obj = (struct cmm_xlator *)xlator;
@@ -1017,20 +1017,20 @@ void *cmm_xlator_alloc_buf(struct cmm_xlatorobject *xlator, void *pVaBuf,
1017 DBC_REQUIRE(refs > 0); 1017 DBC_REQUIRE(refs > 0);
1018 DBC_REQUIRE(xlator != NULL); 1018 DBC_REQUIRE(xlator != NULL);
1019 DBC_REQUIRE(xlator_obj->hcmm_mgr != NULL); 1019 DBC_REQUIRE(xlator_obj->hcmm_mgr != NULL);
1020 DBC_REQUIRE(pVaBuf != NULL); 1020 DBC_REQUIRE(va_buf != NULL);
1021 DBC_REQUIRE(uPaSize > 0); 1021 DBC_REQUIRE(uPaSize > 0);
1022 DBC_REQUIRE(xlator_obj->ul_seg_id > 0); 1022 DBC_REQUIRE(xlator_obj->ul_seg_id > 0);
1023 1023
1024 if (xlator_obj) { 1024 if (xlator_obj) {
1025 attrs.ul_seg_id = xlator_obj->ul_seg_id; 1025 attrs.ul_seg_id = xlator_obj->ul_seg_id;
1026 *(volatile u32 *)pVaBuf = 0; 1026 *(volatile u32 *)va_buf = 0;
1027 /* Alloc SM */ 1027 /* Alloc SM */
1028 pbuf = 1028 pbuf =
1029 cmm_calloc_buf(xlator_obj->hcmm_mgr, uPaSize, &attrs, NULL); 1029 cmm_calloc_buf(xlator_obj->hcmm_mgr, uPaSize, &attrs, NULL);
1030 if (pbuf) { 1030 if (pbuf) {
1031 /* convert to translator(node/strm) process Virtual 1031 /* convert to translator(node/strm) process Virtual
1032 * address */ 1032 * address */
1033 *(volatile u32 **)pVaBuf = 1033 *(volatile u32 **)va_buf =
1034 (u32 *) cmm_xlator_translate(xlator, 1034 (u32 *) cmm_xlator_translate(xlator,
1035 pbuf, CMM_PA2VA); 1035 pbuf, CMM_PA2VA);
1036 } 1036 }
diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c
index ae44beda759..d9501eb675d 100644
--- a/drivers/staging/tidspbridge/pmgr/cod.c
+++ b/drivers/staging/tidspbridge/pmgr/cod.c
@@ -360,13 +360,13 @@ int cod_get_base_name(struct cod_manager *cod_mgr_obj, char *sz_name,
360 * Retrieve the entry point of a loaded DSP program image 360 * Retrieve the entry point of a loaded DSP program image
361 * 361 *
362 */ 362 */
363int cod_get_entry(struct cod_manager *cod_mgr_obj, u32 *pulEntry) 363int cod_get_entry(struct cod_manager *cod_mgr_obj, u32 *entry_pt)
364{ 364{
365 DBC_REQUIRE(refs > 0); 365 DBC_REQUIRE(refs > 0);
366 DBC_REQUIRE(IS_VALID(cod_mgr_obj)); 366 DBC_REQUIRE(IS_VALID(cod_mgr_obj));
367 DBC_REQUIRE(pulEntry != NULL); 367 DBC_REQUIRE(entry_pt != NULL);
368 368
369 *pulEntry = cod_mgr_obj->ul_entry; 369 *entry_pt = cod_mgr_obj->ul_entry;
370 370
371 return 0; 371 return 0;
372} 372}
@@ -397,7 +397,7 @@ int cod_get_loader(struct cod_manager *cod_mgr_obj,
397 * given the section name. 397 * given the section name.
398 */ 398 */
399int cod_get_section(struct cod_libraryobj *lib, IN char *str_sect, 399int cod_get_section(struct cod_libraryobj *lib, IN char *str_sect,
400 OUT u32 *addr, OUT u32 *puLen) 400 OUT u32 *addr, OUT u32 *len)
401{ 401{
402 struct cod_manager *cod_mgr_obj; 402 struct cod_manager *cod_mgr_obj;
403 int status = 0; 403 int status = 0;
@@ -407,19 +407,19 @@ int cod_get_section(struct cod_libraryobj *lib, IN char *str_sect,
407 DBC_REQUIRE(IS_VALID(lib->cod_mgr)); 407 DBC_REQUIRE(IS_VALID(lib->cod_mgr));
408 DBC_REQUIRE(str_sect != NULL); 408 DBC_REQUIRE(str_sect != NULL);
409 DBC_REQUIRE(addr != NULL); 409 DBC_REQUIRE(addr != NULL);
410 DBC_REQUIRE(puLen != NULL); 410 DBC_REQUIRE(len != NULL);
411 411
412 *addr = 0; 412 *addr = 0;
413 *puLen = 0; 413 *len = 0;
414 if (lib != NULL) { 414 if (lib != NULL) {
415 cod_mgr_obj = lib->cod_mgr; 415 cod_mgr_obj = lib->cod_mgr;
416 status = cod_mgr_obj->fxns.get_sect_fxn(lib->dbll_lib, str_sect, 416 status = cod_mgr_obj->fxns.get_sect_fxn(lib->dbll_lib, str_sect,
417 addr, puLen); 417 addr, len);
418 } else { 418 } else {
419 status = -ESPIPE; 419 status = -ESPIPE;
420 } 420 }
421 421
422 DBC_ENSURE(DSP_SUCCEEDED(status) || ((*addr == 0) && (*puLen == 0))); 422 DBC_ENSURE(DSP_SUCCEEDED(status) || ((*addr == 0) && (*len == 0)));
423 423
424 return status; 424 return status;
425} 425}
diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c
index e94ef6b6f6d..cb4d2a7ceef 100644
--- a/drivers/staging/tidspbridge/pmgr/dbll.c
+++ b/drivers/staging/tidspbridge/pmgr/dbll.c
@@ -573,7 +573,7 @@ int dbll_load(struct dbll_library_obj *lib, dbll_flags flags,
573 * ======== dbll_load_sect ======== 573 * ======== dbll_load_sect ========
574 * Not supported for COFF. 574 * Not supported for COFF.
575 */ 575 */
576int dbll_load_sect(struct dbll_library_obj *zl_lib, char *sectName, 576int dbll_load_sect(struct dbll_library_obj *zl_lib, char *sec_name,
577 struct dbll_attrs *attrs) 577 struct dbll_attrs *attrs)
578{ 578{
579 DBC_REQUIRE(zl_lib); 579 DBC_REQUIRE(zl_lib);
@@ -853,11 +853,11 @@ func_end:
853 * ======== dbll_unload_sect ======== 853 * ======== dbll_unload_sect ========
854 * Not supported for COFF. 854 * Not supported for COFF.
855 */ 855 */
856int dbll_unload_sect(struct dbll_library_obj *lib, char *sectName, 856int dbll_unload_sect(struct dbll_library_obj *lib, char *sec_name,
857 struct dbll_attrs *attrs) 857 struct dbll_attrs *attrs)
858{ 858{
859 DBC_REQUIRE(refs > 0); 859 DBC_REQUIRE(refs > 0);
860 DBC_REQUIRE(sectName != NULL); 860 DBC_REQUIRE(sec_name != NULL);
861 861
862 return -ENOSYS; 862 return -ENOSYS;
863} 863}