diff options
| author | Rene Sapiens <rene.sapiens@ti.com> | 2010-07-09 21:24:09 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-07-22 10:45:37 -0700 |
| commit | c8c1ad8ce317c1e213db47f094d6eee8dec7d280 (patch) | |
| tree | 823b8d5384e1d5297af53f568f6a588cecd040a6 /drivers/staging/tidspbridge/rmgr/rmm.c | |
| parent | 5a09ddeae940ceea68a8b2dada71bc0cc609c894 (diff) | |
staging: ti dspbridge: make variables in prototypes match within functions definitions
This patch renames the variables in the parameter lists and in the function
definitions to make them match.
Signed-off-by: Rene Sapiens <rene.sapiens@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/tidspbridge/rmgr/rmm.c')
| -rw-r--r-- | drivers/staging/tidspbridge/rmgr/rmm.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/staging/tidspbridge/rmgr/rmm.c b/drivers/staging/tidspbridge/rmgr/rmm.c index 0354b0f75c4b..910132ff1d5f 100644 --- a/drivers/staging/tidspbridge/rmgr/rmm.c +++ b/drivers/staging/tidspbridge/rmgr/rmm.c @@ -307,7 +307,7 @@ void rmm_exit(void) /* * ======== rmm_free ======== */ -bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 addr, u32 size, +bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 dsp_addr, u32 size, bool reserved) { struct rmm_ovly_sect *sect; @@ -316,8 +316,9 @@ bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 addr, u32 size, DBC_REQUIRE(target); DBC_REQUIRE(reserved || segid < target->num_segs); - DBC_REQUIRE(reserved || (addr >= target->seg_tab[segid].base && - (addr + size) <= (target->seg_tab[segid].base + + DBC_REQUIRE(reserved || (dsp_addr >= target->seg_tab[segid].base && + (dsp_addr + size) <= (target->seg_tab[segid]. + base + target->seg_tab[segid]. length))); @@ -325,7 +326,7 @@ bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 addr, u32 size, * Free or unreserve memory. */ if (!reserved) { - ret = free_block(target, segid, addr, size); + ret = free_block(target, segid, dsp_addr, size); if (ret) target->seg_tab[segid].number--; @@ -333,7 +334,7 @@ bool rmm_free(struct rmm_target_obj *target, u32 segid, u32 addr, u32 size, /* Unreserve memory */ sect = (struct rmm_ovly_sect *)lst_first(target->ovly_list); while (sect != NULL) { - if (addr == sect->addr) { + if (dsp_addr == sect->addr) { DBC_ASSERT(size == sect->size); /* Remove from list */ lst_remove_elem(target->ovly_list, |