diff options
Diffstat (limited to 'drivers/staging/tidspbridge/rmgr')
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/dbdcd.c | 4 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/drv.c | 2 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/mgr.c | 8 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/nldr.c | 5 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/node.c | 20 |
5 files changed, 19 insertions, 20 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c index 190ca3fe732..2ae48c9a936 100644 --- a/drivers/staging/tidspbridge/rmgr/dbdcd.c +++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c @@ -101,14 +101,14 @@ static int dcd_uuid_from_string(char *sz_uuid, struct dsp_uuid *uuid_obj) * if the converted value doesn't fit in u32. So, convert the * last six bytes to u64 and memcpy what is needed */ - if(sscanf(sz_uuid, "%8x%c%4hx%c%4hx%c%2hhx%2hhx%c%llx", + if (sscanf(sz_uuid, "%8x%c%4hx%c%4hx%c%2hhx%2hhx%c%llx", &uuid_tmp.data1, &c, &uuid_tmp.data2, &c, &uuid_tmp.data3, &c, &uuid_tmp.data4, &uuid_tmp.data5, &c, &t) != 10) return -EINVAL; t = cpu_to_be64(t); - memcpy(&uuid_tmp.data6[0], ((char*)&t) + 2, 6); + memcpy(&uuid_tmp.data6[0], ((char *)&t) + 2, 6); *uuid_obj = uuid_tmp; return 0; diff --git a/drivers/staging/tidspbridge/rmgr/drv.c b/drivers/staging/tidspbridge/rmgr/drv.c index be26917a689..757ae20b38e 100644 --- a/drivers/staging/tidspbridge/rmgr/drv.c +++ b/drivers/staging/tidspbridge/rmgr/drv.c @@ -738,7 +738,7 @@ void mem_ext_phys_pool_release(void) * Allocate physically contiguous, uncached memory from external memory pool */ -static void *mem_ext_phys_mem_alloc(u32 bytes, u32 align, u32 * phys_addr) +static void *mem_ext_phys_mem_alloc(u32 bytes, u32 align, u32 *phys_addr) { u32 new_alloc_ptr; u32 offset; diff --git a/drivers/staging/tidspbridge/rmgr/mgr.c b/drivers/staging/tidspbridge/rmgr/mgr.c index b32ba0ad2a0..93e6282f122 100644 --- a/drivers/staging/tidspbridge/rmgr/mgr.c +++ b/drivers/staging/tidspbridge/rmgr/mgr.c @@ -266,15 +266,15 @@ int mgr_enum_processor_info(u32 processor_id, * this is a clumsy overwrite */ processor_info->processor_type = DSPTYPE64; } else { - dev_dbg(bridge, "%s: Failed to get DCD processor info " - "%x\n", __func__, status2); + dev_dbg(bridge, "%s: Failed to get DCD processor info %x\n", + __func__, status2); status = -EPERM; } } *pu_num_procs = proc_index; if (proc_detect == false) { - dev_dbg(bridge, "%s: Failed to get proc info from DCD, so use " - "CFG registry\n", __func__); + dev_dbg(bridge, "%s: Failed to get proc info from DCD, so use CFG registry\n", + __func__); processor_info->processor_type = DSPTYPE64; } func_end: diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c index ca3805046a7..5ac507ccd19 100644 --- a/drivers/staging/tidspbridge/rmgr/nldr.c +++ b/drivers/staging/tidspbridge/rmgr/nldr.c @@ -623,7 +623,7 @@ void nldr_delete(struct nldr_object *nldr_obj) * ======== nldr_get_fxn_addr ======== */ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, - char *str_fxn, u32 * addr) + char *str_fxn, u32 *addr) { struct dbll_sym_val *dbll_sym; struct nldr_object *nldr_obj; @@ -1751,9 +1751,8 @@ static void unload_ovly(struct nldr_nodeobject *nldr_node_obj, } if (ref_count && (*ref_count > 0)) { *ref_count -= 1; - if (other_ref) { + if (other_ref) *other_ref -= 1; - } } if (ref_count && *ref_count == 0) { diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c index 87dfa92ab45..9d3044a384e 100644 --- a/drivers/staging/tidspbridge/rmgr/node.c +++ b/drivers/staging/tidspbridge/rmgr/node.c @@ -246,7 +246,7 @@ static void fill_stream_def(struct node_object *hnode, struct node_strmdef *pstrm_def, struct dsp_strmattr *pattrs); static void free_stream(struct node_mgr *hnode_mgr, struct stream_chnl stream); -static int get_fxn_address(struct node_object *hnode, u32 * fxn_addr, +static int get_fxn_address(struct node_object *hnode, u32 *fxn_addr, u32 phase); static int get_node_props(struct dcd_manager *hdcd_mgr, struct node_object *hnode, @@ -406,7 +406,7 @@ int node_allocate(struct proc_object *hprocessor, /* check for page aligned Heap size */ if (((attr_in->heap_size) & (PG_SIZE4K - 1))) { - pr_err("%s: node heap size not aligned to 4K, size = 0x%x \n", + pr_err("%s: node heap size not aligned to 4K, size = 0x%x\n", __func__, attr_in->heap_size); status = -EINVAL; } else { @@ -703,9 +703,9 @@ DBAPI node_alloc_msg_buf(struct node_object *hnode, u32 usize, pattr = &node_dfltbufattrs; /* set defaults */ status = proc_get_processor_id(pnode->processor, &proc_id); - if (proc_id != DSP_UNIT) { + if (proc_id != DSP_UNIT) goto func_end; - } + /* If segment ID includes MEM_SETVIRTUALSEGID then pbuffer is a * virt address, so set this info in this node's translator * object for future ref. If MEM_GETVIRTUALSEGID then retrieve @@ -886,11 +886,10 @@ int node_connect(struct node_object *node1, u32 stream1, if (pattrs && pattrs->strm_mode != STRMMODE_PROCCOPY) return -EPERM; /* illegal stream mode */ - if (node1_type != NODE_GPP) { + if (node1_type != NODE_GPP) hnode_mgr = node1->node_mgr; - } else { + else hnode_mgr = node2->node_mgr; - } /* Enter critical section */ mutex_lock(&hnode_mgr->node_mgr_lock); @@ -1576,7 +1575,7 @@ func_end: * Purpose: * Frees the message buffer. */ -int node_free_msg_buf(struct node_object *hnode, u8 * pbuffer, +int node_free_msg_buf(struct node_object *hnode, u8 *pbuffer, struct dsp_bufferattr *pattr) { struct node_object *pnode = (struct node_object *)hnode; @@ -2322,7 +2321,8 @@ int node_terminate(struct node_object *hnode, int *pstatus) if (!hdeh_mgr) goto func_cont; - bridge_deh_notify(hdeh_mgr, DSP_SYSERROR, DSP_EXCEPTIONABORT); + bridge_deh_notify(hdeh_mgr, DSP_SYSERROR, + DSP_EXCEPTIONABORT); } } func_cont: @@ -2640,7 +2640,7 @@ static void free_stream(struct node_mgr *hnode_mgr, struct stream_chnl stream) * Purpose: * Retrieves the address for create, execute or delete phase for a node. */ -static int get_fxn_address(struct node_object *hnode, u32 * fxn_addr, +static int get_fxn_address(struct node_object *hnode, u32 *fxn_addr, u32 phase) { char *pstr_fxn_name = NULL; |