From 2badcc777f00088e79e5afb36426762c40856f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?=
 <vjaquez@igalia.com>
Date: Fri, 9 Mar 2012 01:03:42 +0100
Subject: [PATCH] --- yaml --- r: 289227 b: refs/heads/master c:
 974f9cd50ae72c02490298372a2a64fb47c4de91 h: refs/heads/master i:   289225:
 ffd43d73681e147624494a7855476ee692555cab   289223:
 6082f889fbeb8e33a2fd916b0960f232ba24de94 v: v3

---
 [refs]                                        |  2 +-
 .../tidspbridge/include/dspbridge/rmm.h       | 25 -------------------
 .../drivers/staging/tidspbridge/pmgr/dspapi.c | 10 ++------
 trunk/drivers/staging/tidspbridge/rmgr/nldr.c |  6 -----
 trunk/drivers/staging/tidspbridge/rmgr/rmm.c  | 20 ---------------
 5 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/[refs] b/[refs]
index 8cd9ed1183e6..3dbebf96725c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 311abd9ac44f72f4d10adaaf3af1c273b0f71db8
+refs/heads/master: 974f9cd50ae72c02490298372a2a64fb47c4de91
diff --git a/trunk/drivers/staging/tidspbridge/include/dspbridge/rmm.h b/trunk/drivers/staging/tidspbridge/include/dspbridge/rmm.h
index baea536681e9..f7a4dc8ecb4f 100644
--- a/trunk/drivers/staging/tidspbridge/include/dspbridge/rmm.h
+++ b/trunk/drivers/staging/tidspbridge/include/dspbridge/rmm.h
@@ -114,18 +114,6 @@ extern int rmm_create(struct rmm_target_obj **target_obj,
  */
 extern void rmm_delete(struct rmm_target_obj *target);
 
-/*
- *  ======== rmm_exit ========
- *  Exit the RMM module
- *
- *  Parameters:
- *  Returns:
- *  Requires:
- *      rmm_init successfully called.
- *  Ensures:
- */
-extern void rmm_exit(void);
-
 /*
  *  ======== rmm_free ========
  *  Free or unreserve memory allocated through rmm_alloc().
@@ -147,19 +135,6 @@ extern void rmm_exit(void);
 extern bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr,
 		     u32 size, bool reserved);
 
-/*
- *  ======== rmm_init ========
- *  Initialize the RMM module
- *
- *  Parameters:
- *  Returns:
- *      TRUE:   Success.
- *      FALSE:  Failure.
- *  Requires:
- *  Ensures:
- */
-extern bool rmm_init(void);
-
 /*
  *  ======== rmm_stat ========
  *  Obtain  memory segment status
diff --git a/trunk/drivers/staging/tidspbridge/pmgr/dspapi.c b/trunk/drivers/staging/tidspbridge/pmgr/dspapi.c
index 06e3b244f83f..0a55465b6258 100644
--- a/trunk/drivers/staging/tidspbridge/pmgr/dspapi.c
+++ b/trunk/drivers/staging/tidspbridge/pmgr/dspapi.c
@@ -272,7 +272,6 @@ void api_exit(void)
 		msg_exit();
 		io_exit();
 		mgr_exit();
-		rmm_exit();
 	}
 }
 
@@ -285,18 +284,17 @@ bool api_init(void)
 {
 	bool ret = true;
 	bool fdev, fchnl, fmsg, fio;
-	bool fmgr, frmm;
+	bool fmgr;
 
 	if (api_c_refs == 0) {
 		/* initialize driver and other modules */
 		fmgr = mgr_init();
-		frmm = rmm_init();
 		fchnl = chnl_init();
 		fmsg = msg_mod_init();
 		fio = io_init();
 		fdev = dev_init();
 		ret = fdev && fchnl && fmsg && fio;
-		ret = ret && fmgr && frmm;
+		ret = ret && fmgr;
 		if (!ret) {
 
 			if (fmgr)
@@ -313,10 +311,6 @@ bool api_init(void)
 
 			if (fdev)
 				dev_exit();
-
-			if (frmm)
-				rmm_exit();
-
 		}
 	}
 	if (ret)
diff --git a/trunk/drivers/staging/tidspbridge/rmgr/nldr.c b/trunk/drivers/staging/tidspbridge/rmgr/nldr.c
index 5cff46f767b8..a9d7a320afd5 100644
--- a/trunk/drivers/staging/tidspbridge/rmgr/nldr.c
+++ b/trunk/drivers/staging/tidspbridge/rmgr/nldr.c
@@ -628,9 +628,6 @@ void nldr_delete(struct nldr_object *nldr_obj)
 void nldr_exit(void)
 {
 	refs--;
-
-	if (refs == 0)
-		rmm_exit();
 }
 
 /*
@@ -746,9 +743,6 @@ int nldr_get_rmm_manager(struct nldr_object *nldr,
  */
 bool nldr_init(void)
 {
-	if (refs == 0)
-		rmm_init();
-
 	refs++;
 
 	return true;
diff --git a/trunk/drivers/staging/tidspbridge/rmgr/rmm.c b/trunk/drivers/staging/tidspbridge/rmgr/rmm.c
index 55acfcd80a84..52187bd97729 100644
--- a/trunk/drivers/staging/tidspbridge/rmgr/rmm.c
+++ b/trunk/drivers/staging/tidspbridge/rmgr/rmm.c
@@ -80,8 +80,6 @@ struct rmm_target_obj {
 	struct list_head ovly_list;	/* List of overlay memory in use */
 };
 
-static u32 refs;		/* module reference count */
-
 static bool alloc_block(struct rmm_target_obj *target, u32 segid, u32 size,
 			u32 align, u32 *dsp_address);
 static bool free_block(struct rmm_target_obj *target, u32 segid, u32 addr,
@@ -259,14 +257,6 @@ void rmm_delete(struct rmm_target_obj *target)
 	kfree(target);
 }
 
-/*
- *  ======== rmm_exit ========
- */
-void rmm_exit(void)
-{
-	refs--;
-}
-
 /*
  *  ======== rmm_free ========
  */
@@ -299,16 +289,6 @@ bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr, u32 size,
 	return ret;
 }
 
-/*
- *  ======== rmm_init ========
- */
-bool rmm_init(void)
-{
-	refs++;
-
-	return true;
-}
-
 /*
  *  ======== rmm_stat ========
  */