staging: tidspbridge: remove io_init() and io_exit()

The io module has a io_init() and a io_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/io.h b/drivers/staging/tidspbridge/include/dspbridge/io.h
index 500bbd71684dd0442620a81540e89d3da53cec97..75057185690856a86e6840a64774dd2daf22e4d9 100644 (file)
--- a/drivers/staging/tidspbridge/include/dspbridge/io.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/io.h
@@ -55,7 +55,6 @@ struct io_attrs {
  *      -EINVAL: Invalid DSP word size (must be > 0).
  *               Invalid base address for DSP communications.
  *  Requires:
- *      io_init(void) called.
  *      io_man != NULL.
  *      mgr_attrts != NULL.
  *  Ensures:
@@ -74,36 +73,8 @@ extern int io_create(struct io_mgr **io_man,
  *      0:        Success.
  *      -EFAULT:    hio_mgr was invalid.
  *  Requires:
- *      io_init(void) called.
  *  Ensures:
  */
 extern int io_destroy(struct io_mgr *hio_mgr);
 
-/*
- *  ======== io_exit ========
- *  Purpose:
- *      Discontinue usage of the IO module.
- *  Parameters:
- *  Returns:
- *  Requires:
- *      io_init(void) previously called.
- *  Ensures:
- *      Resources, if any acquired in io_init(void), are freed when the last
- *      client of IO calls io_exit(void).
- */
-extern void io_exit(void);
-
-/*
- *  ======== io_init ========
- *  Purpose:
- *      Initialize the IO 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 io_init(void);
-
 #endif /* CHNL_ */

diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
index 5201bedba94aa0c7933f550c7962267ade5e13a1..b9ca24c18e131712d98f6cb5dff72141bd2a7a88 100644 (file)
--- 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();
-               io_exit();
                mgr_exit();
        }
 }
@@ -281,24 +280,19 @@ void api_exit(void)
 bool api_init(void)
 {
        bool ret = true;
-       bool fdev, fio;
+       bool fdev;
        bool fmgr;
 
        if (api_c_refs == 0) {
                /* initialize driver and other modules */
                fmgr = mgr_init();
-               fio = io_init();
                fdev = dev_init();
-               ret = fdev && fio;
-               ret = ret && fmgr;
+               ret = fdev && fmgr;
                if (!ret) {
 
                        if (fmgr)
                                mgr_exit();
 
-                       if (fio)
-                               io_exit();
-
                        if (fdev)
                                dev_exit();
                }

diff --git a/drivers/staging/tidspbridge/pmgr/io.c b/drivers/staging/tidspbridge/pmgr/io.c
index a56b085deb4de454f554ecf949ac0468a5281aeb..4073c9c672fd2bf2dd314aff4d9b65ad38a8a038 100644 (file)
--- a/drivers/staging/tidspbridge/pmgr/io.c
+++ b/drivers/staging/tidspbridge/pmgr/io.c
@@ -30,9 +30,6 @@
 #include <ioobj.h>
 #include <dspbridge/io.h>
 
-/*  ----------------------------------- Globals */
-static u32 refs;
-
 /*
  *  ======== io_create ========
  *  Purpose:
@@ -94,28 +91,3 @@ int io_destroy(struct io_mgr *hio_mgr)
 
        return status;
 }
-
-/*
- *  ======== io_exit ========
- *  Purpose:
- *      Discontinue usage of the IO module.
- */
-void io_exit(void)
-{
-       refs--;
-}
-
-/*
- *  ======== io_init ========
- *  Purpose:
- *      Initialize the IO module's private state.
- */
-bool io_init(void)
-{
-       bool ret = true;
-
-       if (ret)
-               refs++;
-
-       return ret;
-}