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

[pandora-kernel.git] / drivers / staging / tidspbridge / pmgr / dspapi.c

diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
index 767ffe2..a5f1f65 100644 (file)
--- a/drivers/staging/tidspbridge/pmgr/dspapi.c
+++ b/drivers/staging/tidspbridge/pmgr/dspapi.c
@@ -24,9 +24,6 @@
 /*  ----------------------------------- DSP/BIOS Bridge */
 #include <dspbridge/dbdefs.h>
 
-/*  ----------------------------------- Trace & Debug */
-#include <dspbridge/dbc.h>
-
 /*  ----------------------------------- OS Adaptation Layer */
 #include <dspbridge/ntfy.h>
 
@@ -266,25 +263,19 @@ err:
  */
 void api_exit(void)
 {
-       DBC_REQUIRE(api_c_refs > 0);
        api_c_refs--;
 
        if (api_c_refs == 0) {
                /* Release all modules initialized in api_init(). */
-               cod_exit();
                dev_exit();
                chnl_exit();
                msg_exit();
                io_exit();
                strm_exit();
                disp_exit();
-               node_exit();
-               proc_exit();
                mgr_exit();
                rmm_exit();
-               drv_exit();
        }
-       DBC_ENSURE(api_c_refs >= 0);
 }
 
 /*
@@ -295,15 +286,12 @@ void api_exit(void)
 bool api_init(void)
 {
        bool ret = true;
-       bool fdrv, fdev, fcod, fchnl, fmsg, fio;
-       bool fmgr, fproc, fnode, fdisp, fstrm, frmm;
+       bool fdev, fchnl, fmsg, fio;
+       bool fmgr, fdisp, fstrm, frmm;
 
        if (api_c_refs == 0) {
                /* initialize driver and other modules */
-               fdrv = drv_init();
                fmgr = mgr_init();
-               fproc = proc_init();
-               fnode = node_init();
                fdisp = disp_init();
                fstrm = strm_init();
                frmm = rmm_init();
@@ -311,12 +299,9 @@ bool api_init(void)
                fmsg = msg_mod_init();
                fio = io_init();
                fdev = dev_init();
-               fcod = cod_init();
-               ret = fdrv && fdev && fchnl && fcod && fmsg && fio;
-               ret = ret && fmgr && fproc && frmm;
+               ret = fdev && fchnl && fmsg && fio;
+               ret = ret && fmgr && frmm;
                if (!ret) {
-                       if (fdrv)
-                               drv_exit();
 
                        if (fmgr)
                                mgr_exit();
@@ -324,12 +309,6 @@ bool api_init(void)
                        if (fstrm)
                                strm_exit();
 
-                       if (fproc)
-                               proc_exit();
-
-                       if (fnode)
-                               node_exit();
-
                        if (fdisp)
                                disp_exit();
 
@@ -345,9 +324,6 @@ bool api_init(void)
                        if (fdev)
                                dev_exit();
 
-                       if (fcod)
-                               cod_exit();
-
                        if (frmm)
                                rmm_exit();
 
@@ -382,8 +358,6 @@ int api_init_complete2(void)
        struct drv_data *drv_datap;
        u8 dev_type;
 
-       DBC_REQUIRE(api_c_refs > 0);
-
        /*  Walk the list of DevObjects, get each devnode, and attempting to
         *  autostart the board. Note that this requires COF loading, which
         *  requires KFILE. */