Commit 974f9cd5 authored by Víctor Manuel Jáquez Leal's avatar Víctor Manuel Jáquez Leal Committed by Greg Kroah-Hartman

staging: tidspbridge: remove rmm_init() and rmm_exit()

The rmm module has a rmm_init() and a rmm_exit() whose only purpose is
to keep a reference counting which is not used at all.

This patch removes these functions and the reference count variable.

There is no functional changes.
Signed-off-by: default avatarVíctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 311abd9a
...@@ -114,18 +114,6 @@ extern int rmm_create(struct rmm_target_obj **target_obj, ...@@ -114,18 +114,6 @@ extern int rmm_create(struct rmm_target_obj **target_obj,
*/ */
extern void rmm_delete(struct rmm_target_obj *target); extern void rmm_delete(struct rmm_target_obj *target);
/*
* ======== rmm_exit ========
* Exit the RMM module
*
* Parameters:
* Returns:
* Requires:
* rmm_init successfully called.
* Ensures:
*/
extern void rmm_exit(void);
/* /*
* ======== rmm_free ======== * ======== rmm_free ========
* Free or unreserve memory allocated through rmm_alloc(). * Free or unreserve memory allocated through rmm_alloc().
...@@ -147,19 +135,6 @@ extern void rmm_exit(void); ...@@ -147,19 +135,6 @@ extern void rmm_exit(void);
extern bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr, extern bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr,
u32 size, bool reserved); u32 size, bool reserved);
/*
* ======== rmm_init ========
* Initialize the RMM module
*
* Parameters:
* Returns:
* TRUE: Success.
* FALSE: Failure.
* Requires:
* Ensures:
*/
extern bool rmm_init(void);
/* /*
* ======== rmm_stat ======== * ======== rmm_stat ========
* Obtain memory segment status * Obtain memory segment status
......
...@@ -272,7 +272,6 @@ void api_exit(void) ...@@ -272,7 +272,6 @@ void api_exit(void)
msg_exit(); msg_exit();
io_exit(); io_exit();
mgr_exit(); mgr_exit();
rmm_exit();
} }
} }
...@@ -285,18 +284,17 @@ bool api_init(void) ...@@ -285,18 +284,17 @@ bool api_init(void)
{ {
bool ret = true; bool ret = true;
bool fdev, fchnl, fmsg, fio; bool fdev, fchnl, fmsg, fio;
bool fmgr, frmm; bool fmgr;
if (api_c_refs == 0) { if (api_c_refs == 0) {
/* initialize driver and other modules */ /* initialize driver and other modules */
fmgr = mgr_init(); fmgr = mgr_init();
frmm = rmm_init();
fchnl = chnl_init(); fchnl = chnl_init();
fmsg = msg_mod_init(); fmsg = msg_mod_init();
fio = io_init(); fio = io_init();
fdev = dev_init(); fdev = dev_init();
ret = fdev && fchnl && fmsg && fio; ret = fdev && fchnl && fmsg && fio;
ret = ret && fmgr && frmm; ret = ret && fmgr;
if (!ret) { if (!ret) {
if (fmgr) if (fmgr)
...@@ -313,10 +311,6 @@ bool api_init(void) ...@@ -313,10 +311,6 @@ bool api_init(void)
if (fdev) if (fdev)
dev_exit(); dev_exit();
if (frmm)
rmm_exit();
} }
} }
if (ret) if (ret)
......
...@@ -628,9 +628,6 @@ void nldr_delete(struct nldr_object *nldr_obj) ...@@ -628,9 +628,6 @@ void nldr_delete(struct nldr_object *nldr_obj)
void nldr_exit(void) void nldr_exit(void)
{ {
refs--; refs--;
if (refs == 0)
rmm_exit();
} }
/* /*
...@@ -746,9 +743,6 @@ int nldr_get_rmm_manager(struct nldr_object *nldr, ...@@ -746,9 +743,6 @@ int nldr_get_rmm_manager(struct nldr_object *nldr,
*/ */
bool nldr_init(void) bool nldr_init(void)
{ {
if (refs == 0)
rmm_init();
refs++; refs++;
return true; return true;
......
...@@ -80,8 +80,6 @@ struct rmm_target_obj { ...@@ -80,8 +80,6 @@ struct rmm_target_obj {
struct list_head ovly_list; /* List of overlay memory in use */ struct list_head ovly_list; /* List of overlay memory in use */
}; };
static u32 refs; /* module reference count */
static bool alloc_block(struct rmm_target_obj *target, u32 segid, u32 size, static bool alloc_block(struct rmm_target_obj *target, u32 segid, u32 size,
u32 align, u32 *dsp_address); u32 align, u32 *dsp_address);
static bool free_block(struct rmm_target_obj *target, u32 segid, u32 addr, static bool free_block(struct rmm_target_obj *target, u32 segid, u32 addr,
...@@ -259,14 +257,6 @@ void rmm_delete(struct rmm_target_obj *target) ...@@ -259,14 +257,6 @@ void rmm_delete(struct rmm_target_obj *target)
kfree(target); kfree(target);
} }
/*
* ======== rmm_exit ========
*/
void rmm_exit(void)
{
refs--;
}
/* /*
* ======== rmm_free ======== * ======== rmm_free ========
*/ */
...@@ -299,16 +289,6 @@ bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr, u32 size, ...@@ -299,16 +289,6 @@ bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr, u32 size,
return ret; return ret;
} }
/*
* ======== rmm_init ========
*/
bool rmm_init(void)
{
refs++;
return true;
}
/* /*
* ======== rmm_stat ======== * ======== rmm_stat ========
*/ */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment