Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 289232
b: refs/heads/master
c: d071c0e
h: refs/heads/master
v: v3
  • Loading branch information
Víctor Manuel Jáquez Leal authored and Greg Kroah-Hartman committed Mar 9, 2012
1 parent 275eed6 commit ad2abb2
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 43 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a71aa396eec042606b9722745d4aa4159bde2e87
refs/heads/master: d071c0e9cad589a42a6c1739b088acb9d4724481
4 changes: 0 additions & 4 deletions trunk/drivers/staging/tidspbridge/include/dspbridge/dmm.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,6 @@ extern int dmm_create(struct dmm_object **dmm_manager,
struct dev_object *hdev_obj,
const struct dmm_mgrattrs *mgr_attrts);

extern bool dmm_init(void);

extern void dmm_exit(void);

extern int dmm_create_tables(struct dmm_object *dmm_mgr,
u32 addr, u32 size);

Expand Down
6 changes: 0 additions & 6 deletions trunk/drivers/staging/tidspbridge/pmgr/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -657,9 +657,6 @@ int dev_get_bridge_context(struct dev_object *hdev_obj,
void dev_exit(void)
{
refs--;

if (refs == 0)
dmm_exit();
}

/*
Expand All @@ -671,9 +668,6 @@ bool dev_init(void)
{
bool ret = true;

if (refs == 0)
dmm_init();

if (ret)
refs++;

Expand Down
32 changes: 0 additions & 32 deletions trunk/drivers/staging/tidspbridge/pmgr/dmm.c
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ struct dmm_object {
spinlock_t dmm_lock; /* Lock to access dmm mgr */
};

/* ----------------------------------- Globals */
static u32 refs; /* module reference count */
struct map_page {
u32 region_size:15;
u32 mapped_size:15;
Expand Down Expand Up @@ -171,18 +169,6 @@ int dmm_delete_tables(struct dmm_object *dmm_mgr)
return status;
}

/*
* ======== dmm_exit ========
* Purpose:
* Discontinue usage of module; free resources when reference count
* reaches 0.
*/
void dmm_exit(void)
{

refs--;
}

/*
* ======== dmm_get_handle ========
* Purpose:
Expand All @@ -205,24 +191,6 @@ int dmm_get_handle(void *hprocessor, struct dmm_object **dmm_manager)
return status;
}

/*
* ======== dmm_init ========
* Purpose:
* Initializes private state of DMM module.
*/
bool dmm_init(void)
{
bool ret = true;

if (ret)
refs++;

virtual_mapping_table = NULL;
table_size = 0;

return ret;
}

/*
* ======== dmm_map_memory ========
* Purpose:
Expand Down

0 comments on commit ad2abb2

Please sign in to comment.