diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-05-07 20:56:00 +0200 |
|---|---|---|
| committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-07-30 21:21:39 +0200 |
| commit | b7785e954348465e1926d9c10ff3e49c207d4ec6 (patch) | |
| tree | 1c5866e1c99cc9185b3b8c993f7280572360a591 /arch/m68k | |
| parent | 1c388919d89ca35741e9c4d3255adf87f76f0c06 (diff) | |
| download | blackbird-op-linux-b7785e954348465e1926d9c10ff3e49c207d4ec6.tar.gz blackbird-op-linux-b7785e954348465e1926d9c10ff3e49c207d4ec6.zip | |
m68k/amiga: Chip RAM - Use lookup_resource()
Replace a custom implementation (which doesn't lock the resource tree) by a
call to lookup_resource()
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/amiga/chipram.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c index 4790f77cbd48..99449fbf9a72 100644 --- a/arch/m68k/amiga/chipram.c +++ b/arch/m68k/amiga/chipram.c @@ -93,21 +93,21 @@ void *amiga_chip_alloc_res(unsigned long size, struct resource *res) void amiga_chip_free(void *ptr) { unsigned long start = ZTWO_PADDR(ptr); - struct resource **p, *res; + struct resource *res; unsigned long size; - for (p = &chipram_res.child; (res = *p); p = &res->sibling) { - if (res->start != start) - continue; - *p = res->sibling; - size = resource_size(res); - pr_debug("amiga_chip_free: free %lu bytes at %p\n", size, ptr); - atomic_add(size, &chipavail); - kfree(res); + res = lookup_resource(&chipram_res, start); + if (!res) { + pr_err("amiga_chip_free: trying to free nonexistent region at " + "%p\n", ptr); return; } - pr_err("amiga_chip_free: trying to free nonexistent region at %p\n", - ptr); + + size = resource_size(res); + pr_debug("amiga_chip_free: free %lu bytes at %p\n", size, ptr); + atomic_add(size, &chipavail); + release_resource(res); + kfree(res); } EXPORT_SYMBOL(amiga_chip_free); |
