From a05c5dc3fc73c11fbb06c493b1ae6d77c4ac172e Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Fri, 9 Mar 2012 01:03:48 +0100
Subject: [PATCH] staging: tidspbridge: remove dev_init() and dev_exit()
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The dev module has a dev_init() and a dev_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>
---
 .../tidspbridge/include/dspbridge/dev.h       | 27 -----------------
 drivers/staging/tidspbridge/pmgr/dev.c        | 29 -------------------
 drivers/staging/tidspbridge/pmgr/dspapi.c     | 22 ++------------
 3 files changed, 3 insertions(+), 75 deletions(-)

diff --git a/drivers/staging/tidspbridge/include/dspbridge/dev.h b/drivers/staging/tidspbridge/include/dspbridge/dev.h
index f92b4be0b413..fa2d79ef6cc8 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/dev.h
+++ b/drivers/staging/tidspbridge/include/dspbridge/dev.h
@@ -477,33 +477,6 @@ extern int dev_get_bridge_context(struct dev_object *hdev_obj,
 				      struct bridge_dev_context
 				      **phbridge_context);
 
-/*
- *  ======== dev_exit ========
- *  Purpose:
- *      Decrement reference count, and free resources when reference count is
- *      0.
- *  Parameters:
- *  Returns:
- *  Requires:
- *      DEV is initialized.
- *  Ensures:
- *      When reference count == 0, DEV's private resources are freed.
- */
-extern void dev_exit(void);
-
-/*
- *  ======== dev_init ========
- *  Purpose:
- *      Initialize DEV's private state, keeping a reference count on each call.
- *  Parameters:
- *  Returns:
- *      TRUE if initialized; FALSE if error occurred.
- *  Requires:
- *  Ensures:
- *      TRUE: A requirement for the other public DEV functions.
- */
-extern bool dev_init(void);
-
 /*
  *  ======== dev_insert_proc_object ========
  *  Purpose:
diff --git a/drivers/staging/tidspbridge/pmgr/dev.c b/drivers/staging/tidspbridge/pmgr/dev.c
index c5e627ce8b8f..6234ffb5e8a3 100644
--- a/drivers/staging/tidspbridge/pmgr/dev.c
+++ b/drivers/staging/tidspbridge/pmgr/dev.c
@@ -81,9 +81,6 @@ struct drv_ext {
 	char sz_string[MAXREGPATHLENGTH];
 };
 
-/*  ----------------------------------- Globals */
-static u32 refs;		/* Module reference count */
-
 /*  ----------------------------------- Function Prototypes */
 static int fxn_not_implemented(int arg, ...);
 static int init_cod_mgr(struct dev_object *dev_obj);
@@ -648,32 +645,6 @@ int dev_get_bridge_context(struct dev_object *hdev_obj,
 	return status;
 }
 
-/*
- *  ======== dev_exit ========
- *  Purpose:
- *      Decrement reference count, and free resources when reference count is
- *      0.
- */
-void dev_exit(void)
-{
-	refs--;
-}
-
-/*
- *  ======== dev_init ========
- *  Purpose:
- *      Initialize DEV's private state, keeping a reference count on each call.
- */
-bool dev_init(void)
-{
-	bool ret = true;
-
-	if (ret)
-		refs++;
-
-	return ret;
-}
-
 /*
  *  ======== dev_notify_clients ========
  *  Purpose:
diff --git a/drivers/staging/tidspbridge/pmgr/dspapi.c b/drivers/staging/tidspbridge/pmgr/dspapi.c
index b9ca24c18e13..9ef1ad9527af 100644
--- a/drivers/staging/tidspbridge/pmgr/dspapi.c
+++ b/drivers/staging/tidspbridge/pmgr/dspapi.c
@@ -265,11 +265,8 @@ void api_exit(void)
 {
 	api_c_refs--;
 
-	if (api_c_refs == 0) {
-		/* Release all modules initialized in api_init(). */
-		dev_exit();
+	if (api_c_refs == 0)
 		mgr_exit();
-	}
 }
 
 /*
@@ -280,23 +277,10 @@ void api_exit(void)
 bool api_init(void)
 {
 	bool ret = true;
-	bool fdev;
-	bool fmgr;
-
-	if (api_c_refs == 0) {
-		/* initialize driver and other modules */
-		fmgr = mgr_init();
-		fdev = dev_init();
-		ret = fdev && fmgr;
-		if (!ret) {
 
-			if (fmgr)
-				mgr_exit();
+	if (api_c_refs == 0)
+		ret = mgr_init();
 
-			if (fdev)
-				dev_exit();
-		}
-	}
 	if (ret)
 		api_c_refs++;
 
-- 
2.30.2