From 0a767f667b91c8383fcaea014af326c3b08013e9 Mon Sep 17 00:00:00 2001 From: Ivan Gomez Castellanos Date: Wed, 25 Aug 2010 17:08:57 -0500 Subject: [PATCH] --- yaml --- r: 219631 b: refs/heads/master c: 345c8bec42d7c55f98167da596ea5ca5f53d9f7d h: refs/heads/master i: 219629: 4c4f54bd9cf7f1df2208ae07ea281f3306ac5b61 219627: 050618e1910a748ce445ffdd58a60a3bf5a6b31d 219623: 2b2b64ae6ac04ecaced0c6e0ebba11bbafb5bc8f 219615: f0935e0b4e2a3997cf76d1b567e8fe2bc3829249 v: v3 --- [refs] | 2 +- .../tidspbridge/include/dspbridge/cfg.h | 26 ------------------- .../staging/tidspbridge/services/cfg.c | 20 -------------- .../staging/tidspbridge/services/services.c | 12 --------- 4 files changed, 1 insertion(+), 59 deletions(-) diff --git a/[refs] b/[refs] index 593268ba3221..1479171a7169 100644 --- 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 index a84fa2b084b0..eea90001bfff 100644 --- a/trunk/drivers/staging/tidspbridge/include/dspbridge/cfg.h +++ b/trunk/drivers/staging/tidspbridge/include/dspbridge/cfg.h @@ -21,19 +21,6 @@ #include #include -/* - * ======== 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 index e9cdbf6d36b1..b9c38829921b 100644 --- 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 index 6a7dd6f3ecba..47bac21144b1 100644 --- 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; }