summaryrefslogtreecommitdiff
path: root/drivers/staging/tidspbridge/rmgr
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/staging/tidspbridge/rmgr')
-rw-r--r--drivers/staging/tidspbridge/rmgr/dbdcd.c14
-rw-r--r--drivers/staging/tidspbridge/rmgr/disp.c10
-rw-r--r--drivers/staging/tidspbridge/rmgr/drv.c14
-rw-r--r--drivers/staging/tidspbridge/rmgr/node.c12
4 files changed, 25 insertions, 25 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c
index 9d05166f8a64..be98c4cdbd9f 100644
--- a/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -71,7 +71,7 @@ static int get_dep_lib_info(IN struct dcd_manager *hdcd_mgr,
IN struct dsp_uuid *uuid_obj,
IN OUT u16 *pNumLibs,
OPTIONAL OUT u16 *pNumPersLibs,
- OPTIONAL OUT struct dsp_uuid *pDepLibUuids,
+ OPTIONAL OUT struct dsp_uuid *dep_lib_uuids,
OPTIONAL OUT bool *pPersistentDepLibs,
IN enum nldr_phase phase);
@@ -327,7 +327,7 @@ void dcd_exit(void)
*/
int dcd_get_dep_libs(IN struct dcd_manager *hdcd_mgr,
IN struct dsp_uuid *uuid_obj,
- u16 num_libs, OUT struct dsp_uuid *pDepLibUuids,
+ u16 num_libs, OUT struct dsp_uuid *dep_lib_uuids,
OUT bool *pPersistentDepLibs,
IN enum nldr_phase phase)
{
@@ -336,11 +336,11 @@ int dcd_get_dep_libs(IN struct dcd_manager *hdcd_mgr,
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(hdcd_mgr);
DBC_REQUIRE(uuid_obj != NULL);
- DBC_REQUIRE(pDepLibUuids != NULL);
+ DBC_REQUIRE(dep_lib_uuids != NULL);
DBC_REQUIRE(pPersistentDepLibs != NULL);
status =
- get_dep_lib_info(hdcd_mgr, uuid_obj, &num_libs, NULL, pDepLibUuids,
+ get_dep_lib_info(hdcd_mgr, uuid_obj, &num_libs, NULL, dep_lib_uuids,
pPersistentDepLibs, phase);
return status;
@@ -1393,7 +1393,7 @@ static int get_dep_lib_info(IN struct dcd_manager *hdcd_mgr,
IN struct dsp_uuid *uuid_obj,
IN OUT u16 *pNumLibs,
OPTIONAL OUT u16 *pNumPersLibs,
- OPTIONAL OUT struct dsp_uuid *pDepLibUuids,
+ OPTIONAL OUT struct dsp_uuid *dep_lib_uuids,
OPTIONAL OUT bool *pPersistentDepLibs,
enum nldr_phase phase)
{
@@ -1407,7 +1407,7 @@ static int get_dep_lib_info(IN struct dcd_manager *hdcd_mgr,
u32 dw_data_size = COD_MAXPATHLENGTH;
char seps[] = ", ";
char *token = NULL;
- bool get_uuids = (pDepLibUuids != NULL);
+ bool get_uuids = (dep_lib_uuids != NULL);
u16 dep_libs = 0;
int status = 0;
@@ -1476,7 +1476,7 @@ static int get_dep_lib_info(IN struct dcd_manager *hdcd_mgr,
} else {
/* Retrieve UUID string. */
uuid_uuid_from_string(token,
- &(pDepLibUuids
+ &(dep_lib_uuids
[dep_libs]));
/* Is this library persistent? */
token = strsep(&psz_cur, seps);
diff --git a/drivers/staging/tidspbridge/rmgr/disp.c b/drivers/staging/tidspbridge/rmgr/disp.c
index 1bcd4030cee2..5f51d50aab4a 100644
--- a/drivers/staging/tidspbridge/rmgr/disp.c
+++ b/drivers/staging/tidspbridge/rmgr/disp.c
@@ -89,7 +89,7 @@ static int send_message(struct disp_object *disp_obj, u32 timeout,
*/
int disp_create(OUT struct disp_object **phDispObject,
struct dev_object *hdev_obj,
- IN CONST struct disp_attr *pDispAttrs)
+ IN CONST struct disp_attr *disp_attrs)
{
struct disp_object *disp_obj;
struct bridge_drv_interface *intf_fxns;
@@ -100,7 +100,7 @@ int disp_create(OUT struct disp_object **phDispObject,
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(phDispObject != NULL);
- DBC_REQUIRE(pDispAttrs != NULL);
+ DBC_REQUIRE(disp_attrs != NULL);
DBC_REQUIRE(hdev_obj != NULL);
*phDispObject = NULL;
@@ -142,14 +142,14 @@ int disp_create(OUT struct disp_object **phDispObject,
/* Open channels for communicating with the RMS */
chnl_attr_obj.uio_reqs = CHNLIOREQS;
chnl_attr_obj.event_obj = NULL;
- ul_chnl_id = pDispAttrs->ul_chnl_offset + CHNLTORMSOFFSET;
+ ul_chnl_id = disp_attrs->ul_chnl_offset + CHNLTORMSOFFSET;
status = (*intf_fxns->pfn_chnl_open) (&(disp_obj->chnl_to_dsp),
disp_obj->hchnl_mgr,
CHNL_MODETODSP, ul_chnl_id,
&chnl_attr_obj);
if (DSP_SUCCEEDED(status)) {
- ul_chnl_id = pDispAttrs->ul_chnl_offset + CHNLFROMRMSOFFSET;
+ ul_chnl_id = disp_attrs->ul_chnl_offset + CHNLFROMRMSOFFSET;
status =
(*intf_fxns->pfn_chnl_open) (&(disp_obj->chnl_from_dsp),
disp_obj->hchnl_mgr,
@@ -158,7 +158,7 @@ int disp_create(OUT struct disp_object **phDispObject,
}
if (DSP_SUCCEEDED(status)) {
/* Allocate buffer for commands, replies */
- disp_obj->ul_bufsize = pDispAttrs->ul_chnl_buf_size;
+ disp_obj->ul_bufsize = disp_attrs->ul_chnl_buf_size;
disp_obj->ul_bufsize_rms = RMS_COMMANDBUFSIZE;
disp_obj->pbuf = kzalloc(disp_obj->ul_bufsize, GFP_KERNEL);
if (disp_obj->pbuf == NULL)
diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c
index 4abfd81e1bd6..78211a653b22 100644
--- a/drivers/staging/tidspbridge/rmgr/drv.c
+++ b/drivers/staging/tidspbridge/rmgr/drv.c
@@ -730,14 +730,14 @@ int drv_remove_dev_object(struct drv_object *driver_obj,
* Purpose:
* Requests resources from the OS.
*/
-int drv_request_resources(u32 dw_context, u32 *pDevNodeString)
+int drv_request_resources(u32 dw_context, u32 *dev_node_strg)
{
int status = 0;
struct drv_object *pdrv_object;
struct drv_ext *pszdev_node;
DBC_REQUIRE(dw_context != 0);
- DBC_REQUIRE(pDevNodeString != NULL);
+ DBC_REQUIRE(dev_node_strg != NULL);
/*
* Allocate memory to hold the string. This will live untill
@@ -754,22 +754,22 @@ int drv_request_resources(u32 dw_context, u32 *pDevNodeString)
(char *)dw_context, MAXREGPATHLENGTH - 1);
pszdev_node->sz_string[MAXREGPATHLENGTH - 1] = '\0';
/* Update the Driver Object List */
- *pDevNodeString = (u32) pszdev_node->sz_string;
+ *dev_node_strg = (u32) pszdev_node->sz_string;
lst_put_tail(pdrv_object->dev_node_string,
(struct list_head *)pszdev_node);
} else {
status = -ENOMEM;
- *pDevNodeString = 0;
+ *dev_node_strg = 0;
}
} else {
dev_dbg(bridge, "%s: Failed to get Driver Object from Registry",
__func__);
- *pDevNodeString = 0;
+ *dev_node_strg = 0;
}
- DBC_ENSURE((DSP_SUCCEEDED(status) && pDevNodeString != NULL &&
+ DBC_ENSURE((DSP_SUCCEEDED(status) && dev_node_strg != NULL &&
!LST_IS_EMPTY(pdrv_object->dev_node_string)) ||
- (DSP_FAILED(status) && *pDevNodeString == 0));
+ (DSP_FAILED(status) && *dev_node_strg == 0));
return status;
}
diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c
index d19d99018291..7cffca4fdc1b 100644
--- a/drivers/staging/tidspbridge/rmgr/node.c
+++ b/drivers/staging/tidspbridge/rmgr/node.c
@@ -253,7 +253,7 @@ static int get_fxn_address(struct node_object *hnode, u32 * pulFxnAddr,
static int get_node_props(struct dcd_manager *hdcd_mgr,
struct node_object *hnode,
CONST struct dsp_uuid *pNodeId,
- struct dcd_genericobj *pdcdProps);
+ struct dcd_genericobj *dcd_prop);
static int get_proc_props(struct node_mgr *hnode_mgr,
struct dev_object *hdev_obj);
static int get_rms_fxns(struct node_mgr *hnode_mgr);
@@ -2891,19 +2891,19 @@ void get_node_info(struct node_object *hnode, struct dsp_nodeinfo *pNodeInfo)
static int get_node_props(struct dcd_manager *hdcd_mgr,
struct node_object *hnode,
CONST struct dsp_uuid *pNodeId,
- struct dcd_genericobj *pdcdProps)
+ struct dcd_genericobj *dcd_prop)
{
u32 len;
struct node_msgargs *pmsg_args;
struct node_taskargs *task_arg_obj;
enum node_type node_type = NODE_TASK;
struct dsp_ndbprops *pndb_props =
- &(pdcdProps->obj_data.node_obj.ndb_props);
+ &(dcd_prop->obj_data.node_obj.ndb_props);
int status = 0;
char sz_uuid[MAXUUIDLEN];
status = dcd_get_object_def(hdcd_mgr, (struct dsp_uuid *)pNodeId,
- DSP_DCDNODETYPE, pdcdProps);
+ DSP_DCDNODETYPE, dcd_prop);
if (DSP_SUCCEEDED(status)) {
hnode->ntype = node_type = pndb_props->ntype;
@@ -2917,9 +2917,9 @@ static int get_node_props(struct dcd_manager *hdcd_mgr,
if (node_type != NODE_DEVICE) {
pmsg_args = &(hnode->create_args.asa.node_msg_args);
pmsg_args->seg_id =
- pdcdProps->obj_data.node_obj.msg_segid;
+ dcd_prop->obj_data.node_obj.msg_segid;
pmsg_args->notify_type =
- pdcdProps->obj_data.node_obj.msg_notify_type;
+ dcd_prop->obj_data.node_obj.msg_notify_type;
pmsg_args->max_msgs = pndb_props->message_depth;
dev_dbg(bridge, "(node) Max Number of Messages: 0x%x\n",
pmsg_args->max_msgs);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 14:51:11 +0000