From: Ernesto Ramos <ernesto@xxxxxx>
Remove function delete_strm_mgr in strm.c and
use kfree instead.
Signed-off-by: Ernesto Ramos <ernesto@xxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
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 73888e3..6c184c6 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 */
/* ----------------------------------- Function Prototypes */
static int delete_strm(struct strm_object *stream_obj);
-static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj);
/*
* ======== strm_allocate_buffer ========
@@ -232,7 +231,7 @@ int strm_create(struct strm_mgr **strm_man,
if (DSP_SUCCEEDED(status))
*strm_man = strm_mgr_obj;
else
- delete_strm_mgr(strm_mgr_obj);
+ kfree(strm_mgr_obj);
DBC_ENSURE((DSP_SUCCEEDED(status) && *strm_man) ||
(DSP_FAILED(status) && *strm_man == NULL));
@@ -250,7 +249,7 @@ void strm_delete(struct strm_mgr *strm_mgr_obj)
DBC_REQUIRE(refs > 0);
DBC_REQUIRE(strm_mgr_obj);
- delete_strm_mgr(strm_mgr_obj);
+ kfree(strm_mgr_obj);
}
/*
@@ -859,14 +858,3 @@ static int delete_strm(struct strm_object *stream_obj)
}
return status;
}
-
-/*
- * ======== delete_strm_mgr ========
- * Purpose:
- * Frees stream manager.
- */
-static void delete_strm_mgr(struct strm_mgr *strm_mgr_obj)
-{
- if (strm_mgr_obj)
- kfree(strm_mgr_obj);
-}
--
1.7.1
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
