diff options
author | Ernesto Ramos <ernesto@ti.com> | 2010-07-28 10:40:50 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-28 11:22:04 -0400 |
commit | 74ea8ff93b3759f27e6677076fe80c0c9c3f209d (patch) | |
tree | 0f9ca06cf119650db48b19111a3420e87fbbe1e2 | |
parent | 3448c5481cc4ae8bf19fae5002f0c4e43007da40 (diff) |
staging:ti dspbridge: remove function delete_strm_mgr
Remove function delete_strm_mgr in strm.c and
use kfree instead.
Signed-off-by: Ernesto Ramos <ernesto@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/staging/tidspbridge/rmgr/strm.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/strm.c b/drivers/staging/tidspbridge/rmgr/strm.c index 73888e37385f..6c184c68529e 100644 --- a/drivers/staging/tidspbridge/rmgr/strm.c +++ b/drivers/staging/tidspbridge/rmgr/strm.c | |||
@@ -90,7 +90,6 @@ static u32 refs; /* module reference count */ | |||
90 | 90 | ||
91 | /* ----------------------------------- Function Prototypes */ | 91 | /* ----------------------------------- Function Prototypes */ |
92 | static int delete_strm(struct strm_object *stream_obj); | 92 | static int delete_strm(struct strm_object *stream_obj); |
93 | static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj); | ||
94 | 93 | ||
95 | /* | 94 | /* |
96 | * ======== strm_allocate_buffer ======== | 95 | * ======== strm_allocate_buffer ======== |
@@ -232,7 +231,7 @@ int strm_create(struct strm_mgr **strm_man, | |||
232 | if (DSP_SUCCEEDED(status)) | 231 | if (DSP_SUCCEEDED(status)) |
233 | *strm_man = strm_mgr_obj; | 232 | *strm_man = strm_mgr_obj; |
234 | else | 233 | else |
235 | delete_strm_mgr(strm_mgr_obj); | 234 | kfree(strm_mgr_obj); |
236 | 235 | ||
237 | DBC_ENSURE((DSP_SUCCEEDED(status) && *strm_man) || | 236 | DBC_ENSURE((DSP_SUCCEEDED(status) && *strm_man) || |
238 | (DSP_FAILED(status) && *strm_man == NULL)); | 237 | (DSP_FAILED(status) && *strm_man == NULL)); |
@@ -250,7 +249,7 @@ void strm_delete(struct strm_mgr *strm_mgr_obj) | |||
250 | DBC_REQUIRE(refs > 0); | 249 | DBC_REQUIRE(refs > 0); |
251 | DBC_REQUIRE(strm_mgr_obj); | 250 | DBC_REQUIRE(strm_mgr_obj); |
252 | 251 | ||
253 | delete_strm_mgr(strm_mgr_obj); | 252 | kfree(strm_mgr_obj); |
254 | } | 253 | } |
255 | 254 | ||
256 | /* | 255 | /* |
@@ -859,14 +858,3 @@ static int delete_strm(struct strm_object *stream_obj) | |||
859 | } | 858 | } |
860 | return status; | 859 | return status; |
861 | } | 860 | } |
862 | |||
863 | /* | ||
864 | * ======== delete_strm_mgr ======== | ||
865 | * Purpose: | ||
866 | * Frees stream manager. | ||
867 | */ | ||
868 | static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj) | ||
869 | { | ||
870 | if (strm_mgr_obj) | ||
871 | kfree(strm_mgr_obj); | ||
872 | } | ||