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

staging: tidspbridge: remove disp_init() and disp_exit()

The disp module has a disp_init() and a disp_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 18ff1592
...@@ -53,7 +53,6 @@ struct disp_attr { ...@@ -53,7 +53,6 @@ struct disp_attr {
* -ENOMEM: Insufficient memory for requested resources. * -ENOMEM: Insufficient memory for requested resources.
* -EPERM: Unable to create dispatcher. * -EPERM: Unable to create dispatcher.
* Requires: * Requires:
* disp_init(void) called.
* disp_attrs != NULL. * disp_attrs != NULL.
* hdev_obj != NULL. * hdev_obj != NULL.
* dispatch_obj != NULL. * dispatch_obj != NULL.
...@@ -73,38 +72,12 @@ extern int disp_create(struct disp_object **dispatch_obj, ...@@ -73,38 +72,12 @@ extern int disp_create(struct disp_object **dispatch_obj,
* disp_obj: Node Dispatcher object. * disp_obj: Node Dispatcher object.
* Returns: * Returns:
* Requires: * Requires:
* disp_init(void) called.
* Valid disp_obj. * Valid disp_obj.
* Ensures: * Ensures:
* disp_obj is invalid. * disp_obj is invalid.
*/ */
extern void disp_delete(struct disp_object *disp_obj); extern void disp_delete(struct disp_object *disp_obj);
/*
* ======== disp_exit ========
* Discontinue usage of DISP module.
*
* Parameters:
* Returns:
* Requires:
* disp_init(void) previously called.
* Ensures:
* Any resources acquired in disp_init(void) will be freed when last DISP
* client calls disp_exit(void).
*/
extern void disp_exit(void);
/*
* ======== disp_init ========
* Initialize the DISP module.
*
* Parameters:
* Returns:
* TRUE if initialization succeeded, FALSE otherwise.
* Ensures:
*/
extern bool disp_init(void);
/* /*
* ======== disp_node_change_priority ======== * ======== disp_node_change_priority ========
* Change the priority of a node currently running on the target. * Change the priority of a node currently running on the target.
...@@ -120,7 +93,6 @@ extern bool disp_init(void); ...@@ -120,7 +93,6 @@ extern bool disp_init(void);
* 0: Success. * 0: Success.
* -ETIME: A timeout occurred before the DSP responded. * -ETIME: A timeout occurred before the DSP responded.
* Requires: * Requires:
* disp_init(void) called.
* Valid disp_obj. * Valid disp_obj.
* hnode != NULL. * hnode != NULL.
* Ensures: * Ensures:
...@@ -148,7 +120,6 @@ extern int disp_node_change_priority(struct disp_object ...@@ -148,7 +120,6 @@ extern int disp_node_change_priority(struct disp_object
* -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:
* disp_init(void) called.
* Valid disp_obj. * Valid disp_obj.
* pargs != NULL. * pargs != NULL.
* hnode != NULL. * hnode != NULL.
...@@ -178,7 +149,6 @@ extern int disp_node_create(struct disp_object *disp_obj, ...@@ -178,7 +149,6 @@ extern int disp_node_create(struct disp_object *disp_obj,
* 0: Success. * 0: Success.
* -ETIME: A timeout occurred before the DSP responded. * -ETIME: A timeout occurred before the DSP responded.
* Requires: * Requires:
* disp_init(void) called.
* Valid disp_obj. * Valid disp_obj.
* hnode != NULL. * hnode != NULL.
* Ensures: * Ensures:
...@@ -204,7 +174,6 @@ extern int disp_node_delete(struct disp_object *disp_obj, ...@@ -204,7 +174,6 @@ extern int disp_node_delete(struct disp_object *disp_obj,
* 0: Success. * 0: Success.
* -ETIME: A timeout occurred before the DSP responded. * -ETIME: A timeout occurred before the DSP responded.
* Requires: * Requires:
* disp_init(void) called.
* Valid disp_obj. * Valid disp_obj.
* hnode != NULL. * hnode != NULL.
* Ensures: * Ensures:
......
...@@ -272,7 +272,6 @@ void api_exit(void) ...@@ -272,7 +272,6 @@ void api_exit(void)
msg_exit(); msg_exit();
io_exit(); io_exit();
strm_exit(); strm_exit();
disp_exit();
mgr_exit(); mgr_exit();
rmm_exit(); rmm_exit();
} }
...@@ -287,12 +286,11 @@ bool api_init(void) ...@@ -287,12 +286,11 @@ bool api_init(void)
{ {
bool ret = true; bool ret = true;
bool fdev, fchnl, fmsg, fio; bool fdev, fchnl, fmsg, fio;
bool fmgr, fdisp, fstrm, frmm; bool fmgr, 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();
fdisp = disp_init();
fstrm = strm_init(); fstrm = strm_init();
frmm = rmm_init(); frmm = rmm_init();
fchnl = chnl_init(); fchnl = chnl_init();
...@@ -309,9 +307,6 @@ bool api_init(void) ...@@ -309,9 +307,6 @@ bool api_init(void)
if (fstrm) if (fstrm)
strm_exit(); strm_exit();
if (fdisp)
disp_exit();
if (fchnl) if (fchnl)
chnl_exit(); chnl_exit();
......
...@@ -69,8 +69,6 @@ struct disp_object { ...@@ -69,8 +69,6 @@ struct disp_object {
u32 data_mau_size; /* Size of DSP Data MAU */ u32 data_mau_size; /* Size of DSP Data MAU */
}; };
static u32 refs;
static void delete_disp(struct disp_object *disp_obj); static void delete_disp(struct disp_object *disp_obj);
static int fill_stream_def(rms_word *pdw_buf, u32 *ptotal, u32 offset, static int fill_stream_def(rms_word *pdw_buf, u32 *ptotal, u32 offset,
struct node_strmdef strm_def, u32 max, struct node_strmdef strm_def, u32 max,
...@@ -172,29 +170,6 @@ void disp_delete(struct disp_object *disp_obj) ...@@ -172,29 +170,6 @@ void disp_delete(struct disp_object *disp_obj)
delete_disp(disp_obj); delete_disp(disp_obj);
} }
/*
* ======== disp_exit ========
* Discontinue usage of DISP module.
*/
void disp_exit(void)
{
refs--;
}
/*
* ======== disp_init ========
* Initialize the DISP module.
*/
bool disp_init(void)
{
bool ret = true;
if (ret)
refs++;
return ret;
}
/* /*
* ======== disp_node_change_priority ======== * ======== disp_node_change_priority ========
* Change the priority of a node currently running on the target. * Change the priority of a node currently running on the target.
......
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