Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/tidspbridge/include/dspbridge/rmm.h

+0 −25
Original line number Diff line number Diff line
@@ -114,18 +114,6 @@ extern int rmm_create(struct rmm_target_obj **target_obj, 
 */

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 ========

 *  Free or unreserve memory allocated through rmm_alloc().
@@ -147,19 +135,6 @@ extern void rmm_exit(void); 
extern bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr,

		     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 ========

 *  Obtain  memory segment status

drivers/staging/tidspbridge/pmgr/dspapi.c

+2 −8
Original line number Diff line number Diff line
@@ -272,7 +272,6 @@ void api_exit(void) 
		msg_exit();

		io_exit();

		mgr_exit();

		rmm_exit();

	}

}
@@ -285,18 +284,17 @@ bool api_init(void) 
{

	bool ret = true;

	bool fdev, fchnl, fmsg, fio;

	bool fmgr, frmm;

	bool fmgr;



	if (api_c_refs == 0) {

		/* initialize driver and other modules */

		fmgr = mgr_init();

		frmm = rmm_init();

		fchnl = chnl_init();

		fmsg = msg_mod_init();

		fio = io_init();

		fdev = dev_init();

		ret = fdev && fchnl && fmsg && fio;

		ret = ret && fmgr && frmm;

		ret = ret && fmgr;

		if (!ret) {



			if (fmgr)
@@ -313,10 +311,6 @@ bool api_init(void) 


			if (fdev)

				dev_exit();



			if (frmm)

				rmm_exit();



		}

	}

	if (ret)

drivers/staging/tidspbridge/rmgr/nldr.c

+0 −6
Original line number Diff line number Diff line
@@ -628,9 +628,6 @@ void nldr_delete(struct nldr_object *nldr_obj) 
void nldr_exit(void)

{

	refs--;



	if (refs == 0)

		rmm_exit();

}



/*
@@ -746,9 +743,6 @@ int nldr_get_rmm_manager(struct nldr_object *nldr, 
 */

bool nldr_init(void)

{

	if (refs == 0)

		rmm_init();



	refs++;



	return true;

drivers/staging/tidspbridge/rmgr/rmm.c

+0 −20
Original line number Diff line number Diff line
@@ -80,8 +80,6 @@ struct rmm_target_obj { 
	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,

			u32 align, u32 *dsp_address);

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) 
	kfree(target);

}



/*

 *  ======== rmm_exit ========

 */

void rmm_exit(void)

{

	refs--;

}



/*

 *  ======== rmm_free ========

 */
@@ -299,16 +289,6 @@ bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr, u32 size, 
	return ret;

}



/*

 *  ======== rmm_init ========

 */

bool rmm_init(void)

{

	refs++;



	return true;

}



/*

 *  ======== rmm_stat ========

 */