---

yaml
---
r: 289223
b: refs/heads/master
c: 02a63f9
h: refs/heads/master
i:
  289221: 8a19350
  289219: fd3f382
  289215: 82849b4
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d4040fadc0b8bc109268cf278bab6f2132e7ab0f
+refs/heads/master: 02a63f9dbc4fec17e441206ddcc2327242fac3fc

trunk/drivers/staging/tidspbridge/include/dspbridge/proc.h

@@ -188,20 +188,6 @@ extern int proc_get_resource_info(void *hprocessor,
 					 *resource_info,
 					 u32 resource_info_size);
 
-/*
- *  ======== proc_exit ========
- *  Purpose:
- *      Decrement reference count, and free resources when reference count is
- *      0.
- *  Parameters:
- *  Returns:
- *  Requires:
- *      PROC is initialized.
- *  Ensures:
- *      When reference count == 0, PROC's private resources are freed.
- */
-extern void proc_exit(void);
-
 /*
  * ======== proc_get_dev_object =========
  *  Purpose:
@@ -222,20 +208,6 @@ extern void proc_exit(void);
 extern int proc_get_dev_object(void *hprocessor,
 				      struct dev_object **device_obj);
 
-/*
- *  ======== proc_init ========
- *  Purpose:
- *      Initialize PROC'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 PROC functions.
- */
-extern bool proc_init(void);
-
 /*
  *  ======== proc_get_state ========
  *  Purpose:

trunk/drivers/staging/tidspbridge/pmgr/dspapi.c

@@ -274,7 +274,6 @@ void api_exit(void)
 		strm_exit();
 		disp_exit();
 		node_exit();
-		proc_exit();
 		mgr_exit();
 		rmm_exit();
 	}
@@ -289,12 +288,11 @@ bool api_init(void)
 {
 	bool ret = true;
 	bool fdev, fchnl, fmsg, fio;
-	bool fmgr, fproc, fnode, fdisp, fstrm, frmm;
+	bool fmgr, fnode, fdisp, fstrm, frmm;
 
 	if (api_c_refs == 0) {
 		/* initialize driver and other modules */
 		fmgr = mgr_init();
-		fproc = proc_init();
 		fnode = node_init();
 		fdisp = disp_init();
 		fstrm = strm_init();
@@ -304,7 +302,7 @@ bool api_init(void)
 		fio = io_init();
 		fdev = dev_init();
 		ret = fdev && fchnl && fmsg && fio;
-		ret = ret && fmgr && fproc && frmm;
+		ret = ret && fmgr && frmm;
 		if (!ret) {
 
 			if (fmgr)
@@ -313,9 +311,6 @@ bool api_init(void)
 			if (fstrm)
 				strm_exit();
 
-			if (fproc)
-				proc_exit();
-
 			if (fnode)
 				node_exit();
 

trunk/drivers/staging/tidspbridge/rmgr/proc.c

@@ -98,8 +98,6 @@ struct proc_object {
 	struct list_head proc_list;
 };
 
-static u32 refs;
-
 DEFINE_MUTEX(proc_lock);	/* For critical sections */
 
 /*  ----------------------------------- Function Prototypes */
@@ -908,17 +906,6 @@ int proc_get_resource_info(void *hprocessor, u32 resource_type,
 	return status;
 }
 
-/*
- *  ======== proc_exit ========
- *  Purpose:
- *      Decrement reference count, and free resources when reference count is
- *      0.
- */
-void proc_exit(void)
-{
-	refs--;
-}
-
 /*
  *  ======== proc_get_dev_object ========
  *  Purpose:
@@ -1009,21 +996,6 @@ int proc_get_trace(void *hprocessor, u8 * pbuf, u32 max_size)
 	return status;
 }
 
-/*
- *  ======== proc_init ========
- *  Purpose:
- *      Initialize PROC's private state, keeping a reference count on each call
- */
-bool proc_init(void)
-{
-	bool ret = true;
-
-	if (ret)
-		refs++;
-
-	return ret;
-}
-
 /*
  *  ======== proc_load ========
  *  Purpose: