diff options
author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2012-03-09 00:03:52 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-09 21:21:08 (GMT) |
commit | 4d3bfdda15d2019a3c2c91c9043ee4c3f5627708 (patch) | |
tree | 34b862e5532ab01b95fb8803fdaa171767ec1871 /drivers/staging/tidspbridge/rmgr | |
parent | 81e8b88a1431bf1209d882da047c94eb8bcc1f14 (diff) | |
download | linux-fsl-qoriq-4d3bfdda15d2019a3c2c91c9043ee4c3f5627708.tar.xz |
staging: tidspbridge: remove nldr_init() and nldr_exit()
The dynamic loader was called by node.c with an interface. This interface was
also modified to avoid the use of nldr_init() and nldr_exit().
There is not functional changes.
Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/tidspbridge/rmgr')
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/nldr.c | 19 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/node.c | 7 |
2 files changed, 0 insertions, 26 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/nldr.c b/drivers/staging/tidspbridge/rmgr/nldr.c index 46086b5..30d5480 100644 --- a/drivers/staging/tidspbridge/rmgr/nldr.c +++ b/drivers/staging/tidspbridge/rmgr/nldr.c @@ -620,15 +620,6 @@ void nldr_delete(struct nldr_object *nldr_obj) } /* - * ======== nldr_exit ======== - * Discontinue usage of NLDR module. - */ -void nldr_exit(void) -{ - /* do nothing */ -} - -/* * ======== nldr_get_fxn_addr ======== */ int nldr_get_fxn_addr(struct nldr_nodeobject *nldr_node_obj, @@ -736,16 +727,6 @@ int nldr_get_rmm_manager(struct nldr_object *nldr, } /* - * ======== nldr_init ======== - * Initialize the NLDR module. - */ -bool nldr_init(void) -{ - /* do nothing */ - return true; -} - -/* * ======== nldr_load ======== */ int nldr_load(struct nldr_nodeobject *nldr_node_obj, diff --git a/drivers/staging/tidspbridge/rmgr/node.c b/drivers/staging/tidspbridge/rmgr/node.c index 908cd1e..7fb426c 100644 --- a/drivers/staging/tidspbridge/rmgr/node.c +++ b/drivers/staging/tidspbridge/rmgr/node.c @@ -159,7 +159,6 @@ struct node_mgr { /* Loader properties */ struct nldr_object *nldr_obj; /* Handle to loader */ struct node_ldr_fxns nldr_fxns; /* Handle to loader functions */ - bool loader_init; /* Loader Init function succeeded? */ }; /* @@ -266,9 +265,7 @@ static struct node_ldr_fxns nldr_fxns = { nldr_allocate, nldr_create, nldr_delete, - nldr_exit, nldr_get_fxn_addr, - nldr_init, nldr_load, nldr_unload, }; @@ -1337,7 +1334,6 @@ int node_create_mgr(struct node_mgr **node_man, nldr_attrs_obj.write = mem_write; nldr_attrs_obj.dsp_word_size = node_mgr_obj->dsp_word_size; nldr_attrs_obj.dsp_mau_size = node_mgr_obj->dsp_mau_size; - node_mgr_obj->loader_init = node_mgr_obj->nldr_fxns.init(); status = node_mgr_obj->nldr_fxns.create(&node_mgr_obj->nldr_obj, hdev_obj, &nldr_attrs_obj); @@ -2507,9 +2503,6 @@ static void delete_node_mgr(struct node_mgr *hnode_mgr) if (hnode_mgr->nldr_obj) hnode_mgr->nldr_fxns.delete(hnode_mgr->nldr_obj); - if (hnode_mgr->loader_init) - hnode_mgr->nldr_fxns.exit(); - kfree(hnode_mgr); } } |