From 345c8bec42d7c55f98167da596ea5ca5f53d9f7d Mon Sep 17 00:00:00 2001
From: Ivan Gomez Castellanos <ivan.gomez@ti.com>
Date: Wed, 25 Aug 2010 17:08:57 -0500
Subject: [PATCH] staging: tidspbridge: Remove cfg_init() and cfg_exit()
The functions cfg_init() and cfg_exit() do nothing, so they are removed.
Signed-off-by: Ivan Gomez Castellanos <ivan.gomez@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
.../tidspbridge/include/dspbridge/cfg.h | 26 -------------------
drivers/staging/tidspbridge/services/cfg.c | 20 --------------
.../staging/tidspbridge/services/services.c | 12 ---------
3 files changed, 58 deletions(-)
diff --git a/drivers/staging/tidspbridge/include/dspbridge/cfg.h b/drivers/staging/tidspbridge/include/dspbridge/cfg.h
index a84fa2b084b0..eea90001bfff 100644
--- a/drivers/staging/tidspbridge/include/dspbridge/cfg.h
+++ b/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/drivers/staging/tidspbridge/services/cfg.c b/drivers/staging/tidspbridge/services/cfg.c
index e9cdbf6d36b1..b9c38829921b 100644
--- a/drivers/staging/tidspbridge/services/cfg.c
+++ b/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/drivers/staging/tidspbridge/services/services.c b/drivers/staging/tidspbridge/services/services.c
index 6a7dd6f3ecba..47bac21144b1 100644
--- a/drivers/staging/tidspbridge/services/services.c
+++ b/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;
}
--
GitLab