From: Ernesto Ramos Date: Thu, 30 Sep 2010 18:33:41 +0000 (-0500) Subject: staging: ti dspbridge: remove cmm_xlator_delete wrapper X-Git-Tag: firefly_0821_release~7613^2~3583^2~3^2~423 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7d1d628344dcc927c1be7363937059a8d6072042;p=firefly-linux-kernel-4.4.55.git staging: ti dspbridge: remove cmm_xlator_delete wrapper Resending this patch since it was missed in the last merge... Remove unnecessary cmm_xlator_delete function and use kfree() kernel function directly. Signed-off-by: Ernesto Ramos Signed-off-by: Omar Ramirez Luna Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/tidspbridge/include/dspbridge/cmm.h b/drivers/staging/tidspbridge/include/dspbridge/cmm.h index a921f1b6ee7f..6ad313fbc66d 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/cmm.h +++ b/drivers/staging/tidspbridge/include/dspbridge/cmm.h @@ -299,25 +299,6 @@ extern int cmm_xlator_create(struct cmm_xlatorobject **xlator, struct cmm_object *hcmm_mgr, struct cmm_xlatorattrs *xlator_attrs); -/* - * ======== cmm_xlator_delete ======== - * Purpose: - * Delete translator resources - * Parameters: - * xlator: handle to translator. - * force: force = TRUE will free XLators SM buffers/dscriptrs. - * Returns: - * 0: Success. - * -EFAULT: Bad translator handle. - * -EPERM: Unable to free translator resources. - * Requires: - * refs > 0 - * Ensures: - * - */ -extern int cmm_xlator_delete(struct cmm_xlatorobject *xlator, - bool force); - /* * ======== cmm_xlator_free_buf ======== * Purpose: diff --git a/drivers/staging/tidspbridge/pmgr/cmm.c b/drivers/staging/tidspbridge/pmgr/cmm.c index e3f77bd453f7..93a7c4fd57e4 100644 --- a/drivers/staging/tidspbridge/pmgr/cmm.c +++ b/drivers/staging/tidspbridge/pmgr/cmm.c @@ -967,23 +967,6 @@ int cmm_xlator_create(struct cmm_xlatorobject **xlator, return status; } -/* - * ======== cmm_xlator_delete ======== - * Purpose: - * Free the Xlator resources. - * VM gets freed later. - */ -int cmm_xlator_delete(struct cmm_xlatorobject *xlator, bool force) -{ - struct cmm_xlator *xlator_obj = (struct cmm_xlator *)xlator; - - DBC_REQUIRE(refs > 0); - - kfree(xlator_obj); - - return 0; -} - /* * ======== cmm_xlator_alloc_buf ======== */ diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c index 84882dc29a50..1562f3c1281c 100644 --- a/drivers/staging/tidspbridge/rmgr/node.c +++ b/drivers/staging/tidspbridge/rmgr/node.c @@ -2505,7 +2505,6 @@ static void delete_node(struct node_object *hnode, struct process_context *pr_ctxt) { struct node_mgr *hnode_mgr; - struct cmm_xlatorobject *xlator; struct bridge_drv_interface *intf_fxns; u32 i; enum node_type node_type; @@ -2523,7 +2522,7 @@ static void delete_node(struct node_object *hnode, hnode_mgr = hnode->hnode_mgr; if (!hnode_mgr) goto func_end; - xlator = hnode->xlator; + node_type = node_get_type(hnode); if (node_type != NODE_DEVICE) { node_msg_args = hnode->create_args.asa.node_msg_args; @@ -2619,11 +2618,7 @@ static void delete_node(struct node_object *hnode, hnode->dcd_props.obj_data.node_obj.pstr_i_alg_name = NULL; /* Free all SM address translator resources */ - if (xlator) { - (void)cmm_xlator_delete(xlator, true); /* force free */ - xlator = NULL; - } - + kfree(hnode->xlator); kfree(hnode->nldr_node_obj); hnode->nldr_node_obj = NULL; hnode->hnode_mgr = NULL; diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c index f4986b7cc9e5..2e427149fb6c 100644 --- a/drivers/staging/tidspbridge/rmgr/strm.c +++ b/drivers/staging/tidspbridge/rmgr/strm.c @@ -834,16 +834,9 @@ static int delete_strm(struct strm_object *stream_obj) * is invalid. */ status = (*intf_fxns->pfn_chnl_close) (stream_obj->chnl_obj); - /* Free all SM address translator resources */ - if (!status) { - if (stream_obj->xlator) { - /* force free */ - (void)cmm_xlator_delete(stream_obj-> - xlator, - true); - } - } } + /* Free all SM address translator resources */ + kfree(stream_obj->xlator); kfree(stream_obj); } else { status = -EFAULT;