diff options
author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2012-03-09 01:03:44 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-09 13:21:07 -0800 |
commit | 1471d6c69ff7843fb7149218d3afb4d5a2e4426c (patch) | |
tree | b09cc472695d323276bea9717d8d4b90cf1cb5dc /drivers/staging/tidspbridge | |
parent | 9658a54dfa86b0c0df7704c8f4315d6e89e95c69 (diff) | |
download | op-kernel-dev-1471d6c69ff7843fb7149218d3afb4d5a2e4426c.zip op-kernel-dev-1471d6c69ff7843fb7149218d3afb4d5a2e4426c.tar.gz |
staging: tidspbridge: remove msg_mod_init() and msg_exit()
The msg module has a msg_mod_init() and a msg_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>
Diffstat (limited to 'drivers/staging/tidspbridge')
-rw-r--r-- | drivers/staging/tidspbridge/include/dspbridge/msg.h | 27 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/pmgr/dspapi.c | 9 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/pmgr/msg.c | 21 |
3 files changed, 2 insertions, 55 deletions
diff --git a/drivers/staging/tidspbridge/include/dspbridge/msg.h b/drivers/staging/tidspbridge/include/dspbridge/msg.h index 95778bc..2c8712c 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/msg.h +++ b/drivers/staging/tidspbridge/include/dspbridge/msg.h @@ -34,7 +34,6 @@ * msg_callback: Called whenever an RMS_EXIT message is received. * Returns: * Requires: - * msg_mod_init(void) called. * msg_man != NULL. * hdev_obj != NULL. * msg_callback != NULL. @@ -52,35 +51,9 @@ extern int msg_create(struct msg_mgr **msg_man, * hmsg_mgr: Handle returned from msg_create(). * Returns: * Requires: - * msg_mod_init(void) called. * Valid hmsg_mgr. * Ensures: */ extern void msg_delete(struct msg_mgr *hmsg_mgr); -/* - * ======== msg_exit ======== - * Purpose: - * Discontinue usage of msg_ctrl module. - * Parameters: - * Returns: - * Requires: - * msg_mod_init(void) successfully called before. - * Ensures: - * Any resources acquired in msg_mod_init(void) will be freed when last - * msg_ctrl client calls msg_exit(void). - */ -extern void msg_exit(void); - -/* - * ======== msg_mod_init ======== - * Purpose: - * Initialize the msg_ctrl module. - * Parameters: - * Returns: - * TRUE if initialization succeeded, FALSE otherwise. - * Ensures: - */ -extern bool msg_mod_init(void); - #endif /* MSG_ */ diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c index 5b9dcad..5201bed 100644 --- a/drivers/staging/tidspbridge/pmgr/dspapi.c +++ b/drivers/staging/tidspbridge/pmgr/dspapi.c @@ -268,7 +268,6 @@ void api_exit(void) if (api_c_refs == 0) { /* Release all modules initialized in api_init(). */ dev_exit(); - msg_exit(); io_exit(); mgr_exit(); } @@ -282,25 +281,21 @@ void api_exit(void) bool api_init(void) { bool ret = true; - bool fdev, fmsg, fio; + bool fdev, fio; bool fmgr; if (api_c_refs == 0) { /* initialize driver and other modules */ fmgr = mgr_init(); - fmsg = msg_mod_init(); fio = io_init(); fdev = dev_init(); - ret = fdev && fmsg && fio; + ret = fdev && fio; ret = ret && fmgr; if (!ret) { if (fmgr) mgr_exit(); - if (fmsg) - msg_exit(); - if (fio) io_exit(); diff --git a/drivers/staging/tidspbridge/pmgr/msg.c b/drivers/staging/tidspbridge/pmgr/msg.c index 077c118..f093cfb 100644 --- a/drivers/staging/tidspbridge/pmgr/msg.c +++ b/drivers/staging/tidspbridge/pmgr/msg.c @@ -33,9 +33,6 @@ #include <msgobj.h> #include <dspbridge/msg.h> -/* ----------------------------------- Globals */ -static u32 refs; /* module reference count */ - /* * ======== msg_create ======== * Purpose: @@ -92,21 +89,3 @@ void msg_delete(struct msg_mgr *hmsg_mgr) __func__, hmsg_mgr); } } - -/* - * ======== msg_exit ======== - */ -void msg_exit(void) -{ - refs--; -} - -/* - * ======== msg_mod_init ======== - */ -bool msg_mod_init(void) -{ - refs++; - - return true; -} |