staging: tidspbridge: remove chnl_init() and chnl_exit()
The chnl module has a chnl_init() and a chnl_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: Víctor Manuel Jáquez Leal <vjaquez@igalia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
974f9cd50a
commit
9658a54dfa
3 changed files with 2 additions and 64 deletions
|
@ -48,7 +48,6 @@
|
||||||
* -ECHRNG: This manager cannot handle this many channels.
|
* -ECHRNG: This manager cannot handle this many channels.
|
||||||
* -EEXIST: Channel manager already exists for this device.
|
* -EEXIST: Channel manager already exists for this device.
|
||||||
* Requires:
|
* Requires:
|
||||||
* chnl_init(void) called.
|
|
||||||
* channel_mgr != NULL.
|
* channel_mgr != NULL.
|
||||||
* mgr_attrts != NULL.
|
* mgr_attrts != NULL.
|
||||||
* Ensures:
|
* Ensures:
|
||||||
|
@ -70,7 +69,6 @@ extern int chnl_create(struct chnl_mgr **channel_mgr,
|
||||||
* 0: Success.
|
* 0: Success.
|
||||||
* -EFAULT: hchnl_mgr was invalid.
|
* -EFAULT: hchnl_mgr was invalid.
|
||||||
* Requires:
|
* Requires:
|
||||||
* chnl_init(void) called.
|
|
||||||
* Ensures:
|
* Ensures:
|
||||||
* 0: Cancels I/O on each open channel.
|
* 0: Cancels I/O on each open channel.
|
||||||
* Closes each open channel.
|
* Closes each open channel.
|
||||||
|
@ -79,31 +77,4 @@ extern int chnl_create(struct chnl_mgr **channel_mgr,
|
||||||
*/
|
*/
|
||||||
extern int chnl_destroy(struct chnl_mgr *hchnl_mgr);
|
extern int chnl_destroy(struct chnl_mgr *hchnl_mgr);
|
||||||
|
|
||||||
/*
|
|
||||||
* ======== chnl_exit ========
|
|
||||||
* Purpose:
|
|
||||||
* Discontinue usage of the CHNL module.
|
|
||||||
* Parameters:
|
|
||||||
* Returns:
|
|
||||||
* Requires:
|
|
||||||
* chnl_init(void) previously called.
|
|
||||||
* Ensures:
|
|
||||||
* Resources, if any acquired in chnl_init(void), are freed when the last
|
|
||||||
* client of CHNL calls chnl_exit(void).
|
|
||||||
*/
|
|
||||||
extern void chnl_exit(void);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ======== chnl_init ========
|
|
||||||
* Purpose:
|
|
||||||
* Initialize the CHNL module's private state.
|
|
||||||
* Parameters:
|
|
||||||
* Returns:
|
|
||||||
* TRUE if initialized; FALSE if error occurred.
|
|
||||||
* Requires:
|
|
||||||
* Ensures:
|
|
||||||
* A requirement for each of the other public CHNL functions.
|
|
||||||
*/
|
|
||||||
extern bool chnl_init(void);
|
|
||||||
|
|
||||||
#endif /* CHNL_ */
|
#endif /* CHNL_ */
|
||||||
|
|
|
@ -38,9 +38,6 @@
|
||||||
/* ----------------------------------- This */
|
/* ----------------------------------- This */
|
||||||
#include <dspbridge/chnl.h>
|
#include <dspbridge/chnl.h>
|
||||||
|
|
||||||
/* ----------------------------------- Globals */
|
|
||||||
static u32 refs;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* ======== chnl_create ========
|
* ======== chnl_create ========
|
||||||
* Purpose:
|
* Purpose:
|
||||||
|
@ -116,28 +113,3 @@ int chnl_destroy(struct chnl_mgr *hchnl_mgr)
|
||||||
|
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
* ======== chnl_exit ========
|
|
||||||
* Purpose:
|
|
||||||
* Discontinue usage of the CHNL module.
|
|
||||||
*/
|
|
||||||
void chnl_exit(void)
|
|
||||||
{
|
|
||||||
refs--;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* ======== chnl_init ========
|
|
||||||
* Purpose:
|
|
||||||
* Initialize the CHNL module's private state.
|
|
||||||
*/
|
|
||||||
bool chnl_init(void)
|
|
||||||
{
|
|
||||||
bool ret = true;
|
|
||||||
|
|
||||||
if (ret)
|
|
||||||
refs++;
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
|
@ -268,7 +268,6 @@ void api_exit(void)
|
||||||
if (api_c_refs == 0) {
|
if (api_c_refs == 0) {
|
||||||
/* Release all modules initialized in api_init(). */
|
/* Release all modules initialized in api_init(). */
|
||||||
dev_exit();
|
dev_exit();
|
||||||
chnl_exit();
|
|
||||||
msg_exit();
|
msg_exit();
|
||||||
io_exit();
|
io_exit();
|
||||||
mgr_exit();
|
mgr_exit();
|
||||||
|
@ -283,26 +282,22 @@ void api_exit(void)
|
||||||
bool api_init(void)
|
bool api_init(void)
|
||||||
{
|
{
|
||||||
bool ret = true;
|
bool ret = true;
|
||||||
bool fdev, fchnl, fmsg, fio;
|
bool fdev, fmsg, fio;
|
||||||
bool fmgr;
|
bool fmgr;
|
||||||
|
|
||||||
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();
|
||||||
fchnl = chnl_init();
|
|
||||||
fmsg = msg_mod_init();
|
fmsg = msg_mod_init();
|
||||||
fio = io_init();
|
fio = io_init();
|
||||||
fdev = dev_init();
|
fdev = dev_init();
|
||||||
ret = fdev && fchnl && fmsg && fio;
|
ret = fdev && fmsg && fio;
|
||||||
ret = ret && fmgr;
|
ret = ret && fmgr;
|
||||||
if (!ret) {
|
if (!ret) {
|
||||||
|
|
||||||
if (fmgr)
|
if (fmgr)
|
||||||
mgr_exit();
|
mgr_exit();
|
||||||
|
|
||||||
if (fchnl)
|
|
||||||
chnl_exit();
|
|
||||||
|
|
||||||
if (fmsg)
|
if (fmsg)
|
||||||
msg_exit();
|
msg_exit();
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue