Commit 18ff1592 authored by Víctor Manuel Jáquez Leal's avatar Víctor Manuel Jáquez Leal Committed by Greg Kroah-Hartman

staging: tidspbridge: remove node_init() and node_exit()

The node module has a node_init() and a node_exit() whose only purpose
is to keep a reference counting which is not used at all.

This patch removes these functions and the reference count variable.

There is no functional changes.
Signed-off-by: default avatarVíctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 02a63f9d
...@@ -47,7 +47,6 @@ ...@@ -47,7 +47,6 @@
* -EPERM: A failure occurred, unable to allocate node. * -EPERM: A failure occurred, unable to allocate node.
* -EBADR: Proccessor is not in the running state. * -EBADR: Proccessor is not in the running state.
* Requires: * Requires:
* node_init(void) called.
* hprocessor != NULL. * hprocessor != NULL.
* node_uuid != NULL. * node_uuid != NULL.
* noderes != NULL. * noderes != NULL.
...@@ -81,7 +80,6 @@ extern int node_allocate(struct proc_object *hprocessor, ...@@ -81,7 +80,6 @@ extern int node_allocate(struct proc_object *hprocessor,
* -EPERM: General Failure. * -EPERM: General Failure.
* -EINVAL: Invalid Size. * -EINVAL: Invalid Size.
* Requires: * Requires:
* node_init(void) called.
* pbuffer != NULL. * pbuffer != NULL.
* Ensures: * Ensures:
*/ */
...@@ -106,7 +104,6 @@ extern int node_alloc_msg_buf(struct node_object *hnode, ...@@ -106,7 +104,6 @@ extern int node_alloc_msg_buf(struct node_object *hnode,
* or NODE_RUNNING state. * or NODE_RUNNING state.
* -ETIME: A timeout occurred before the DSP responded. * -ETIME: A timeout occurred before the DSP responded.
* Requires: * Requires:
* node_init(void) called.
* Ensures: * Ensures:
* 0 && (Node's current priority == prio) * 0 && (Node's current priority == prio)
*/ */
...@@ -157,7 +154,6 @@ extern int node_change_priority(struct node_object *hnode, s32 prio); ...@@ -157,7 +154,6 @@ extern int node_change_priority(struct node_object *hnode, s32 prio);
* Device node to device node, or device node to * Device node to device node, or device node to
* GPP), the two nodes are on different DSPs. * GPP), the two nodes are on different DSPs.
* Requires: * Requires:
* node_init(void) called.
* Ensures: * Ensures:
*/ */
extern int node_connect(struct node_object *node1, extern int node_connect(struct node_object *node1,
...@@ -185,7 +181,6 @@ extern int node_connect(struct node_object *node1, ...@@ -185,7 +181,6 @@ extern int node_connect(struct node_object *node1,
* -ETIME: A timeout occurred before the DSP responded. * -ETIME: A timeout occurred before the DSP responded.
* -EPERM: A failure occurred, unable to create node. * -EPERM: A failure occurred, unable to create node.
* Requires: * Requires:
* node_init(void) called.
* Ensures: * Ensures:
*/ */
extern int node_create(struct node_object *hnode); extern int node_create(struct node_object *hnode);
...@@ -206,7 +201,6 @@ extern int node_create(struct node_object *hnode); ...@@ -206,7 +201,6 @@ extern int node_create(struct node_object *hnode);
* -ENOMEM: Insufficient memory for requested resources. * -ENOMEM: Insufficient memory for requested resources.
* -EPERM: General failure. * -EPERM: General failure.
* Requires: * Requires:
* node_init(void) called.
* node_man != NULL. * node_man != NULL.
* hdev_obj != NULL. * hdev_obj != NULL.
* Ensures: * Ensures:
...@@ -234,7 +228,6 @@ extern int node_create_mgr(struct node_mgr **node_man, ...@@ -234,7 +228,6 @@ extern int node_create_mgr(struct node_mgr **node_man,
* -EPERM: A failure occurred in deleting the node. * -EPERM: A failure occurred in deleting the node.
* -ESPIPE: Delete function not found in the COFF file. * -ESPIPE: Delete function not found in the COFF file.
* Requires: * Requires:
* node_init(void) called.
* Ensures: * Ensures:
* 0: hnode is invalid. * 0: hnode is invalid.
*/ */
...@@ -250,7 +243,6 @@ extern int node_delete(struct node_res_object *noderes, ...@@ -250,7 +243,6 @@ extern int node_delete(struct node_res_object *noderes,
* Returns: * Returns:
* 0: Success. * 0: Success.
* Requires: * Requires:
* node_init(void) called.
* Valid hnode_mgr. * Valid hnode_mgr.
* Ensures: * Ensures:
*/ */
...@@ -286,20 +278,6 @@ extern int node_enum_nodes(struct node_mgr *hnode_mgr, ...@@ -286,20 +278,6 @@ extern int node_enum_nodes(struct node_mgr *hnode_mgr,
u32 *pu_num_nodes, u32 *pu_num_nodes,
u32 *pu_allocated); u32 *pu_allocated);
/*
* ======== node_exit ========
* Purpose:
* Discontinue usage of NODE module.
* Parameters:
* Returns:
* Requires:
* node_init(void) successfully called before.
* Ensures:
* Any resources acquired in node_init(void) will be freed when last NODE
* client calls node_exit(void).
*/
extern void node_exit(void);
/* /*
* ======== node_free_msg_buf ======== * ======== node_free_msg_buf ========
* Purpose: * Purpose:
...@@ -313,7 +291,6 @@ extern void node_exit(void); ...@@ -313,7 +291,6 @@ extern void node_exit(void);
* -EFAULT: Invalid node handle. * -EFAULT: Invalid node handle.
* -EPERM: Failure to free the buffer. * -EPERM: Failure to free the buffer.
* Requires: * Requires:
* node_init(void) called.
* pbuffer != NULL. * pbuffer != NULL.
* Ensures: * Ensures:
*/ */
...@@ -336,7 +313,6 @@ extern int node_free_msg_buf(struct node_object *hnode, ...@@ -336,7 +313,6 @@ extern int node_free_msg_buf(struct node_object *hnode,
* 0: Success. * 0: Success.
* -EFAULT: Invalid hnode. * -EFAULT: Invalid hnode.
* Requires: * Requires:
* node_init(void) called.
* pattr != NULL. * pattr != NULL.
* Ensures: * Ensures:
* 0: *pattrs contains the node's current attributes. * 0: *pattrs contains the node's current attributes.
...@@ -363,7 +339,6 @@ extern int node_get_attr(struct node_object *hnode, ...@@ -363,7 +339,6 @@ extern int node_get_attr(struct node_object *hnode,
* Error occurred while trying to retrieve a message. * Error occurred while trying to retrieve a message.
* -ETIME: Timeout occurred and no message is available. * -ETIME: Timeout occurred and no message is available.
* Requires: * Requires:
* node_init(void) called.
* message != NULL. * message != NULL.
* Ensures: * Ensures:
*/ */
...@@ -385,17 +360,6 @@ extern int node_get_message(struct node_object *hnode, ...@@ -385,17 +360,6 @@ extern int node_get_message(struct node_object *hnode,
extern int node_get_nldr_obj(struct node_mgr *hnode_mgr, extern int node_get_nldr_obj(struct node_mgr *hnode_mgr,
struct nldr_object **nldr_ovlyobj); struct nldr_object **nldr_ovlyobj);
/*
* ======== node_init ========
* Purpose:
* Initialize the NODE module.
* Parameters:
* Returns:
* TRUE if initialization succeeded, FALSE otherwise.
* Ensures:
*/
extern bool node_init(void);
/* /*
* ======== node_on_exit ======== * ======== node_on_exit ========
* Purpose: * Purpose:
...@@ -425,7 +389,6 @@ void node_on_exit(struct node_object *hnode, s32 node_status); ...@@ -425,7 +389,6 @@ void node_on_exit(struct node_object *hnode, s32 node_status);
* -ETIME: A timeout occurred before the DSP responded. * -ETIME: A timeout occurred before the DSP responded.
* DSP_EWRONGSTSATE: Node is not in NODE_RUNNING state. * DSP_EWRONGSTSATE: Node is not in NODE_RUNNING state.
* Requires: * Requires:
* node_init(void) called.
* Ensures: * Ensures:
*/ */
extern int node_pause(struct node_object *hnode); extern int node_pause(struct node_object *hnode);
...@@ -449,7 +412,6 @@ extern int node_pause(struct node_object *hnode); ...@@ -449,7 +412,6 @@ extern int node_pause(struct node_object *hnode);
* -ETIME: Timeout occurred before message could be set. * -ETIME: Timeout occurred before message could be set.
* -EBADR: Node is in invalid state for sending messages. * -EBADR: Node is in invalid state for sending messages.
* Requires: * Requires:
* node_init(void) called.
* pmsg != NULL. * pmsg != NULL.
* Ensures: * Ensures:
*/ */
...@@ -473,7 +435,6 @@ extern int node_put_message(struct node_object *hnode, ...@@ -473,7 +435,6 @@ extern int node_put_message(struct node_object *hnode,
* -ENOSYS: Notification type specified by notify_type is not * -ENOSYS: Notification type specified by notify_type is not
* supported. * supported.
* Requires: * Requires:
* node_init(void) called.
* hnotification != NULL. * hnotification != NULL.
* Ensures: * Ensures:
*/ */
...@@ -500,7 +461,6 @@ extern int node_register_notify(struct node_object *hnode, ...@@ -500,7 +461,6 @@ extern int node_register_notify(struct node_object *hnode,
* DSP_EWRONGSTSATE: Node is not in NODE_PAUSED or NODE_CREATED state. * DSP_EWRONGSTSATE: Node is not in NODE_PAUSED or NODE_CREATED state.
* -ESPIPE: Execute function not found in the COFF file. * -ESPIPE: Execute function not found in the COFF file.
* Requires: * Requires:
* node_init(void) called.
* Ensures: * Ensures:
*/ */
extern int node_run(struct node_object *hnode); extern int node_run(struct node_object *hnode);
...@@ -523,7 +483,6 @@ extern int node_run(struct node_object *hnode); ...@@ -523,7 +483,6 @@ extern int node_run(struct node_object *hnode);
* Unable to terminate the node. * Unable to terminate the node.
* -EBADR: Operation not valid for the current node state. * -EBADR: Operation not valid for the current node state.
* Requires: * Requires:
* node_init(void) called.
* pstatus != NULL. * pstatus != NULL.
* Ensures: * Ensures:
*/ */
......
...@@ -96,7 +96,6 @@ struct node_createargs { ...@@ -96,7 +96,6 @@ struct node_createargs {
* -EINVAL: The node's stream corresponding to index and dir * -EINVAL: The node's stream corresponding to index and dir
* is not a stream to or from the host. * is not a stream to or from the host.
* Requires: * Requires:
* node_init(void) called.
* Valid dir. * Valid dir.
* chan_id != NULL. * chan_id != NULL.
* Ensures: * Ensures:
......
...@@ -273,7 +273,6 @@ void api_exit(void) ...@@ -273,7 +273,6 @@ void api_exit(void)
io_exit(); io_exit();
strm_exit(); strm_exit();
disp_exit(); disp_exit();
node_exit();
mgr_exit(); mgr_exit();
rmm_exit(); rmm_exit();
} }
...@@ -288,12 +287,11 @@ bool api_init(void) ...@@ -288,12 +287,11 @@ bool api_init(void)
{ {
bool ret = true; bool ret = true;
bool fdev, fchnl, fmsg, fio; bool fdev, fchnl, fmsg, fio;
bool fmgr, fnode, fdisp, fstrm, frmm; bool fmgr, fdisp, fstrm, frmm;
if (api_c_refs == 0) { if (api_c_refs == 0) {
/* initialize driver and other modules */ /* initialize driver and other modules */
fmgr = mgr_init(); fmgr = mgr_init();
fnode = node_init();
fdisp = disp_init(); fdisp = disp_init();
fstrm = strm_init(); fstrm = strm_init();
frmm = rmm_init(); frmm = rmm_init();
...@@ -311,9 +309,6 @@ bool api_init(void) ...@@ -311,9 +309,6 @@ bool api_init(void)
if (fstrm) if (fstrm)
strm_exit(); strm_exit();
if (fnode)
node_exit();
if (fdisp) if (fdisp)
disp_exit(); disp_exit();
......
...@@ -261,8 +261,6 @@ static u32 ovly(void *priv_ref, u32 dsp_run_addr, u32 dsp_load_addr, ...@@ -261,8 +261,6 @@ static u32 ovly(void *priv_ref, u32 dsp_run_addr, u32 dsp_load_addr,
static u32 mem_write(void *priv_ref, u32 dsp_add, void *pbuf, static u32 mem_write(void *priv_ref, u32 dsp_add, void *pbuf,
u32 ul_num_bytes, u32 mem_space); u32 ul_num_bytes, u32 mem_space);
static u32 refs; /* module reference count */
/* Dynamic loader functions. */ /* Dynamic loader functions. */
static struct node_ldr_fxns nldr_fxns = { static struct node_ldr_fxns nldr_fxns = {
nldr_allocate, nldr_allocate,
...@@ -1568,16 +1566,6 @@ int node_enum_nodes(struct node_mgr *hnode_mgr, void **node_tab, ...@@ -1568,16 +1566,6 @@ int node_enum_nodes(struct node_mgr *hnode_mgr, void **node_tab,
return status; return status;
} }
/*
* ======== node_exit ========
* Purpose:
* Discontinue usage of NODE module.
*/
void node_exit(void)
{
refs--;
}
/* /*
* ======== node_free_msg_buf ======== * ======== node_free_msg_buf ========
* Purpose: * Purpose:
...@@ -1851,18 +1839,6 @@ enum node_type node_get_type(struct node_object *hnode) ...@@ -1851,18 +1839,6 @@ enum node_type node_get_type(struct node_object *hnode)
return node_type; return node_type;
} }
/*
* ======== node_init ========
* Purpose:
* Initialize the NODE module.
*/
bool node_init(void)
{
refs++;
return true;
}
/* /*
* ======== node_on_exit ======== * ======== node_on_exit ========
* Purpose: * Purpose:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment