Skip to content

Commit

Permalink
staging: tidspbridge: remove dev_init() and dev_exit()
Browse files Browse the repository at this point in the history
The dev module has a dev_init() and a dev_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: Víctor Manuel Jáquez Leal <vjaquez@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Víctor Manuel Jáquez Leal authored and Greg Kroah-Hartman committed Mar 9, 2012
1 parent d071c0e commit a05c5dc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 75 deletions.
27 changes: 0 additions & 27 deletions drivers/staging/tidspbridge/include/dspbridge/dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -477,33 +477,6 @@ extern int dev_get_bridge_context(struct dev_object *hdev_obj,
struct bridge_dev_context
**phbridge_context);

/*
* ======== dev_exit ========
* Purpose:
* Decrement reference count, and free resources when reference count is
* 0.
* Parameters:
* Returns:
* Requires:
* DEV is initialized.
* Ensures:
* When reference count == 0, DEV's private resources are freed.
*/
extern void dev_exit(void);

/*
* ======== dev_init ========
* Purpose:
* Initialize DEV's private state, keeping a reference count on each call.
* Parameters:
* Returns:
* TRUE if initialized; FALSE if error occurred.
* Requires:
* Ensures:
* TRUE: A requirement for the other public DEV functions.
*/
extern bool dev_init(void);

/*
* ======== dev_insert_proc_object ========
* Purpose:
Expand Down
29 changes: 0 additions & 29 deletions drivers/staging/tidspbridge/pmgr/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,6 @@ struct drv_ext {
char sz_string[MAXREGPATHLENGTH];
};

/* ----------------------------------- Globals */
static u32 refs; /* Module reference count */

/* ----------------------------------- Function Prototypes */
static int fxn_not_implemented(int arg, ...);
static int init_cod_mgr(struct dev_object *dev_obj);
Expand Down Expand Up @@ -648,32 +645,6 @@ int dev_get_bridge_context(struct dev_object *hdev_obj,
return status;
}

/*
* ======== dev_exit ========
* Purpose:
* Decrement reference count, and free resources when reference count is
* 0.
*/
void dev_exit(void)
{
refs--;
}

/*
* ======== dev_init ========
* Purpose:
* Initialize DEV's private state, keeping a reference count on each call.
*/
bool dev_init(void)
{
bool ret = true;

if (ret)
refs++;

return ret;
}

/*
* ======== dev_notify_clients ========
* Purpose:
Expand Down
22 changes: 3 additions & 19 deletions drivers/staging/tidspbridge/pmgr/dspapi.c
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,8 @@ void api_exit(void)
{
api_c_refs--;

if (api_c_refs == 0) {
/* Release all modules initialized in api_init(). */
dev_exit();
if (api_c_refs == 0)
mgr_exit();
}
}

/*
Expand All @@ -280,23 +277,10 @@ void api_exit(void)
bool api_init(void)
{
bool ret = true;
bool fdev;
bool fmgr;

if (api_c_refs == 0) {
/* initialize driver and other modules */
fmgr = mgr_init();
fdev = dev_init();
ret = fdev && fmgr;
if (!ret) {

if (fmgr)
mgr_exit();
if (api_c_refs == 0)
ret = mgr_init();

if (fdev)
dev_exit();
}
}
if (ret)
api_c_refs++;

Expand Down

0 comments on commit a05c5dc

Please sign in to comment.