diff options
author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2012-03-08 19:03:50 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-09 16:21:08 -0500 |
commit | d111f6e94da7cf26daee5ccc06406fd4ec904350 (patch) | |
tree | 613f3223769e0317b207092065504110ec09a8ca /drivers/staging/tidspbridge | |
parent | 52041338797a9847f8482cfa2fc8d8c40c629c3a (diff) |
staging: tidspbridge: remove gh_init() and gh_exit()
The gh module has a gh_init() and a gh_exit(), but they don't do
anything, they are just noops.
This patch removes these functions.
There is no functional changes.
Signed-off-by: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/tidspbridge')
-rw-r--r-- | drivers/staging/tidspbridge/gen/gh.c | 18 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/include/dspbridge/gh.h | 2 | ||||
-rw-r--r-- | drivers/staging/tidspbridge/pmgr/dbll.c | 12 |
3 files changed, 2 insertions, 30 deletions
diff --git a/drivers/staging/tidspbridge/gen/gh.c b/drivers/staging/tidspbridge/gen/gh.c index 60aa7b063c9..25eaef782aa 100644 --- a/drivers/staging/tidspbridge/gen/gh.c +++ b/drivers/staging/tidspbridge/gen/gh.c | |||
@@ -95,15 +95,6 @@ void gh_delete(struct gh_t_hash_tab *hash_tab) | |||
95 | } | 95 | } |
96 | 96 | ||
97 | /* | 97 | /* |
98 | * ======== gh_exit ======== | ||
99 | */ | ||
100 | |||
101 | void gh_exit(void) | ||
102 | { | ||
103 | /* Do nothing */ | ||
104 | } | ||
105 | |||
106 | /* | ||
107 | * ======== gh_find ======== | 98 | * ======== gh_find ======== |
108 | */ | 99 | */ |
109 | 100 | ||
@@ -122,15 +113,6 @@ void *gh_find(struct gh_t_hash_tab *hash_tab, void *key) | |||
122 | } | 113 | } |
123 | 114 | ||
124 | /* | 115 | /* |
125 | * ======== gh_init ======== | ||
126 | */ | ||
127 | |||
128 | void gh_init(void) | ||
129 | { | ||
130 | /* Do nothing */ | ||
131 | } | ||
132 | |||
133 | /* | ||
134 | * ======== gh_insert ======== | 116 | * ======== gh_insert ======== |
135 | */ | 117 | */ |
136 | 118 | ||
diff --git a/drivers/staging/tidspbridge/include/dspbridge/gh.h b/drivers/staging/tidspbridge/include/dspbridge/gh.h index 9de291d1f56..da85079dbfb 100644 --- a/drivers/staging/tidspbridge/include/dspbridge/gh.h +++ b/drivers/staging/tidspbridge/include/dspbridge/gh.h | |||
@@ -23,9 +23,7 @@ extern struct gh_t_hash_tab *gh_create(u16 max_bucket, u16 val_size, | |||
23 | bool(*match) (void *, void *), | 23 | bool(*match) (void *, void *), |
24 | void (*delete) (void *)); | 24 | void (*delete) (void *)); |
25 | extern void gh_delete(struct gh_t_hash_tab *hash_tab); | 25 | extern void gh_delete(struct gh_t_hash_tab *hash_tab); |
26 | extern void gh_exit(void); | ||
27 | extern void *gh_find(struct gh_t_hash_tab *hash_tab, void *key); | 26 | extern void *gh_find(struct gh_t_hash_tab *hash_tab, void *key); |
28 | extern void gh_init(void); | ||
29 | extern void *gh_insert(struct gh_t_hash_tab *hash_tab, void *key, void *value); | 27 | extern void *gh_insert(struct gh_t_hash_tab *hash_tab, void *key, void *value); |
30 | #ifdef CONFIG_TIDSPBRIDGE_BACKTRACE | 28 | #ifdef CONFIG_TIDSPBRIDGE_BACKTRACE |
31 | void gh_iterate(struct gh_t_hash_tab *hash_tab, | 29 | void gh_iterate(struct gh_t_hash_tab *hash_tab, |
diff --git a/drivers/staging/tidspbridge/pmgr/dbll.c b/drivers/staging/tidspbridge/pmgr/dbll.c index 071ee86dd02..9f07036cd41 100644 --- a/drivers/staging/tidspbridge/pmgr/dbll.c +++ b/drivers/staging/tidspbridge/pmgr/dbll.c | |||
@@ -187,8 +187,6 @@ static u16 name_hash(void *key, u16 max_bucket); | |||
187 | static bool name_match(void *key, void *sp); | 187 | static bool name_match(void *key, void *sp); |
188 | static void sym_delete(void *value); | 188 | static void sym_delete(void *value); |
189 | 189 | ||
190 | static u32 refs; /* module reference count */ | ||
191 | |||
192 | /* Symbol Redefinition */ | 190 | /* Symbol Redefinition */ |
193 | static int redefined_symbol; | 191 | static int redefined_symbol; |
194 | static int gbl_search = 1; | 192 | static int gbl_search = 1; |
@@ -268,10 +266,7 @@ void dbll_delete(struct dbll_tar_obj *target) | |||
268 | */ | 266 | */ |
269 | void dbll_exit(void) | 267 | void dbll_exit(void) |
270 | { | 268 | { |
271 | refs--; | 269 | /* do nothing */ |
272 | |||
273 | if (refs == 0) | ||
274 | gh_exit(); | ||
275 | } | 270 | } |
276 | 271 | ||
277 | /* | 272 | /* |
@@ -394,10 +389,7 @@ int dbll_get_sect(struct dbll_library_obj *lib, char *name, u32 *paddr, | |||
394 | */ | 389 | */ |
395 | bool dbll_init(void) | 390 | bool dbll_init(void) |
396 | { | 391 | { |
397 | if (refs == 0) | 392 | /* do nothing */ |
398 | gh_init(); | ||
399 | |||
400 | refs++; | ||
401 | 393 | ||
402 | return true; | 394 | return true; |
403 | } | 395 | } |