---

yaml --- r: 219631 b: refs/heads/master c: 345c8be h: refs/heads/master i: 219629: 4c4f54b 219627: 050618e 219623: 2b2b64a 219615: f0935e0 v: v3
git-mirror · Aug 31, 2010 · 0a767f6 · 0a767f6
1 parent 5bdc6b4
commit 0a767f6
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 59 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a6595625c1688077047e508370cf5146d59f359
+refs/heads/master: 345c8bec42d7c55f98167da596ea5ca5f53d9f7d
diff --git a/trunk/drivers/staging/tidspbridge/include/dspbridge/cfg.h b/trunk/drivers/staging/tidspbridge/include/dspbridge/cfg.h
@@ -21,19 +21,6 @@
 #include <dspbridge/host_os.h>
 #include <dspbridge/cfgdefs.h>
 
-/*
- *  ======== cfg_exit ========
- *  Purpose:
- *      Discontinue usage of the CFG module.
- *  Parameters:
- *  Returns:
- *  Requires:
- *      cfg_init(void) was previously called.
- *  Ensures:
- *      Resources acquired in cfg_init(void) are freed.
- */
-extern void cfg_exit(void);
-
 /*
  *  ======== cfg_get_cd_version ========
  *  Purpose:
@@ -151,19 +138,6 @@ extern void cfg_get_perf_value(bool *enable_perf);
 extern int cfg_get_zl_file(struct cfg_devnode *dev_node_obj,
 				  u32 buf_size, char *str_zl_file_name);
 
-/*
- *  ======== cfg_init ========
- *  Purpose:
- *      Initialize the CFG module's private state.
- *  Parameters:
- *  Returns:
- *      TRUE if initialized; FALSE if error occured.
- *  Requires:
- *  Ensures:
- *      A requirement for each of the other public CFG functions.
- */
-extern bool cfg_init(void);
-
 /*
  *  ======== cfg_set_dev_object ========
  *  Purpose:

diff --git a/trunk/drivers/staging/tidspbridge/services/cfg.c b/trunk/drivers/staging/tidspbridge/services/cfg.c
@@ -35,16 +35,6 @@ struct drv_ext {
 	char sz_string[MAXREGPATHLENGTH];
 };
 
-/*
- *  ======== cfg_exit ========
- *  Purpose:
- *      Discontinue usage of the CFG module.
- */
-void cfg_exit(void)
-{
-	/* Do nothing */
-}
-
 /*
  *  ======== cfg_get_dev_object ========
  *  Purpose:
@@ -156,16 +146,6 @@ int cfg_get_object(u32 *value, u8 dw_type)
 	return status;
 }
 
-/*
- *  ======== cfg_init ========
- *  Purpose:
- *      Initialize the CFG module's private state.
- */
-bool cfg_init(void)
-{
-	return true;
-}
-
 /*
  *  ======== cfg_set_dev_object ========
  *  Purpose:

diff --git a/trunk/drivers/staging/tidspbridge/services/services.c b/trunk/drivers/staging/tidspbridge/services/services.c
@@ -43,7 +43,6 @@
  */
 void services_exit(void)
 {
-	cfg_exit();
 }
 
 /*
@@ -54,17 +53,6 @@ void services_exit(void)
 bool services_init(void)
 {
 	bool ret = true;
-	bool fcfg;
-
-	/* Perform required initialization of SERVICES modules. */
-	fcfg = cfg_init();
-
-	ret = fcfg;
-
-	if (!ret) {
-		if (fcfg)
-			cfg_exit();
-	}
 
 	return ret;
 }