staging: tidspbridge: remove cod_init() and cod_exit()

The cod module has a cod_init() and a cod_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>

diff --git a/drivers/staging/tidspbridge/include/dspbridge/cod.h b/drivers/staging/tidspbridge/include/dspbridge/cod.h
index cb684c11b30262d4baebf929888c5064fa835c52..ba2005d02422d44a79fcc0f1294f5a3a75010283 100644 (file)
--- a/drivers/staging/tidspbridge/include/dspbridge/cod.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/cod.h
@@ -99,21 +99,6 @@ extern int cod_create(struct cod_manager **mgr,
  */
 extern void cod_delete(struct cod_manager *cod_mgr_obj);
 
-/*
- *  ======== cod_exit ========
- *  Purpose:
- *      Discontinue usage of the COD module.
- *  Parameters:
- *      None.
- *  Returns:
- *      None.
- *  Requires:
- *      COD initialized.
- *  Ensures:
- *      Resources acquired in cod_init(void) are freed.
- */
-extern void cod_exit(void);
-
 /*
  *  ======== cod_get_base_lib ========
  *  Purpose:
@@ -242,20 +227,6 @@ extern int cod_get_section(struct cod_libraryobj *lib,
 extern int cod_get_sym_value(struct cod_manager *cod_mgr_obj,
                                    char *str_sym, u32 * pul_value);
 
-/*
- *  ======== cod_init ========
- *  Purpose:
- *      Initialize the COD module's private state.
- *  Parameters:
- *      None.
- *  Returns:
- *      TRUE if initialized; FALSE if error occurred.
- *  Requires:
- *  Ensures:
- *      A requirement for each of the other public COD functions.
- */
-extern bool cod_init(void);
-
 /*
  *  ======== cod_load_base ========
  *  Purpose:

diff --git a/drivers/staging/tidspbridge/pmgr/cod.c b/drivers/staging/tidspbridge/pmgr/cod.c
index d01fb8e364b2a2833f008651478ed4339e9e5a67..4007826f7abc5db50041d86ed0d03a9eb0fec996 100644 (file)
--- a/drivers/staging/tidspbridge/pmgr/cod.c
+++ b/drivers/staging/tidspbridge/pmgr/cod.c
@@ -58,8 +58,6 @@ struct cod_libraryobj {
        struct cod_manager *cod_mgr;
 };
 
-static u32 refs = 0L;
-
 static struct dbll_fxns ldr_fxns = {
        (dbll_close_fxn) dbll_close,
        (dbll_create_fxn) dbll_create,
@@ -267,17 +265,6 @@ void cod_delete(struct cod_manager *cod_mgr_obj)
        kfree(cod_mgr_obj);
 }
 
-/*
- *  ======== cod_exit ========
- *  Purpose:
- *      Discontinue usage of the COD module.
- *
- */
-void cod_exit(void)
-{
-       refs--;
-}
-
 /*
  *  ======== cod_get_base_lib ========
  *  Purpose:
@@ -394,22 +381,6 @@ int cod_get_sym_value(struct cod_manager *cod_mgr_obj, char *str_sym,
        return 0;
 }
 
-/*
- *  ======== cod_init ========
- *  Purpose:
- *      Initialize the COD module's private state.
- *
- */
-bool cod_init(void)
-{
-       bool ret = true;
-
-       if (ret)
-               refs++;
-
-       return ret;
-}
-
 /*
  *  ======== cod_load_base ========
  *  Purpose:

diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
index dcf1dabcfc269ecee58031aaf5e098a0a664e131..971e8390a2e6448f53879949d455afb54bb1a4d5 100644 (file)
--- a/drivers/staging/tidspbridge/pmgr/dspapi.c
+++ b/drivers/staging/tidspbridge/pmgr/dspapi.c
@@ -267,7 +267,6 @@ void api_exit(void)
 
        if (api_c_refs == 0) {
                /* Release all modules initialized in api_init(). */
-               cod_exit();
                dev_exit();
                chnl_exit();
                msg_exit();
@@ -289,7 +288,7 @@ void api_exit(void)
 bool api_init(void)
 {
        bool ret = true;
-       bool fdev, fcod, fchnl, fmsg, fio;
+       bool fdev, fchnl, fmsg, fio;
        bool fmgr, fproc, fnode, fdisp, fstrm, frmm;
 
        if (api_c_refs == 0) {
@@ -304,8 +303,7 @@ bool api_init(void)
                fmsg = msg_mod_init();
                fio = io_init();
                fdev = dev_init();
-               fcod = cod_init();
-               ret = fdev && fchnl && fcod && fmsg && fio;
+               ret = fdev && fchnl && fmsg && fio;
                ret = ret && fmgr && fproc && frmm;
                if (!ret) {
 
@@ -336,9 +334,6 @@ bool api_init(void)
                        if (fdev)
                                dev_exit();
 
-                       if (fcod)
-                               cod_exit();
-
                        if (frmm)
                                rmm_exit();
 

diff --git a/drivers/staging/tidspbridge/rmgr/dbdcd.c b/drivers/staging/tidspbridge/rmgr/dbdcd.c
index 8378b7b2b6660a3750cbc298bde7fad4a4a81fd7..12a1d34b39546e93e1b604d3264ac8eef5b71b81 100644 (file)
--- a/drivers/staging/tidspbridge/rmgr/dbdcd.c
+++ b/drivers/staging/tidspbridge/rmgr/dbdcd.c
@@ -289,7 +289,6 @@ void dcd_exit(void)
 
        refs--;
        if (refs == 0) {
-               cod_exit();
                list_for_each_entry_safe(rv, rv_tmp, &reg_key_list, link) {
                        list_del(&rv->link);
                        kfree(rv->path);
@@ -738,22 +737,10 @@ int dcd_get_library_name(struct dcd_manager *hdcd_mgr,
  */
 bool dcd_init(void)
 {
-       bool init_cod;
        bool ret = true;
 
-       if (refs == 0) {
-               /* Initialize required modules. */
-               init_cod = cod_init();
-
-               if (!init_cod) {
-                       ret = false;
-                       /* Exit initialized modules. */
-                       if (init_cod)
-                               cod_exit();
-               }
-
+       if (refs == 0)
                INIT_LIST_HEAD(&reg_key_list);
-       }
 
        if (ret)
                refs++;