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>
This commit is contained in:
Geert Uytterhoeven 2011-05-07 20:56:00 +02:00
parent 1c388919d8
commit b7785e9543

View file

@ -93,21 +93,21 @@ void *amiga_chip_alloc_res(unsigned long size, struct resource *res)
void amiga_chip_free(void *ptr) void amiga_chip_free(void *ptr)
{ {
unsigned long start = ZTWO_PADDR(ptr); unsigned long start = ZTWO_PADDR(ptr);
struct resource **p, *res; struct resource *res;
unsigned long size; unsigned long size;
for (p = &chipram_res.child; (res = *p); p = &res->sibling) { res = lookup_resource(&chipram_res, start);
if (res->start != start) if (!res) {
continue; pr_err("amiga_chip_free: trying to free nonexistent region at "
*p = res->sibling; "%p\n", ptr);
size = resource_size(res);
pr_debug("amiga_chip_free: free %lu bytes at %p\n", size, ptr);
atomic_add(size, &chipavail);
kfree(res);
return; 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); EXPORT_SYMBOL(amiga_chip_free);