Commit b4f6f453 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven

m68k/amiga: Chip RAM - Convert from printk() to pr_*()

and fix a few formattings:
  - resource sizes are now resource_size_t, use %pR to make it future proof,
  - use %lu for unsigned long.
Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent 5be32463
...@@ -47,9 +47,7 @@ void *amiga_chip_alloc(unsigned long size, const char *name) ...@@ -47,9 +47,7 @@ void *amiga_chip_alloc(unsigned long size, const char *name)
/* round up */ /* round up */
size = PAGE_ALIGN(size); size = PAGE_ALIGN(size);
#ifdef DEBUG pr_debug("amiga_chip_alloc: allocate %lu bytes\n", size);
printk("amiga_chip_alloc: allocate %ld bytes\n", size);
#endif
res = kzalloc(sizeof(struct resource), GFP_KERNEL); res = kzalloc(sizeof(struct resource), GFP_KERNEL);
if (!res) if (!res)
return NULL; return NULL;
...@@ -61,9 +59,7 @@ void *amiga_chip_alloc(unsigned long size, const char *name) ...@@ -61,9 +59,7 @@ void *amiga_chip_alloc(unsigned long size, const char *name)
return NULL; return NULL;
} }
chipavail -= size; chipavail -= size;
#ifdef DEBUG pr_debug("amiga_chip_alloc: returning %pR\n", res);
printk("amiga_chip_alloc: returning %lx\n", res->start);
#endif
return (void *)ZTWO_VADDR(res->start); return (void *)ZTWO_VADDR(res->start);
} }
EXPORT_SYMBOL(amiga_chip_alloc); EXPORT_SYMBOL(amiga_chip_alloc);
...@@ -85,20 +81,16 @@ void * __init amiga_chip_alloc_res(unsigned long size, struct resource *res) ...@@ -85,20 +81,16 @@ void * __init amiga_chip_alloc_res(unsigned long size, struct resource *res)
/* dmesg into chipmem prefers memory at the safe end */ /* dmesg into chipmem prefers memory at the safe end */
start = CHIP_PHYSADDR + chipavail - size; start = CHIP_PHYSADDR + chipavail - size;
#ifdef DEBUG pr_debug("amiga_chip_alloc_res: allocate %lu bytes\n", size);
printk("amiga_chip_alloc_res: allocate %ld bytes\n", size);
#endif
if (allocate_resource(&chipram_res, res, size, start, UINT_MAX, if (allocate_resource(&chipram_res, res, size, start, UINT_MAX,
PAGE_SIZE, NULL, NULL) < 0) { PAGE_SIZE, NULL, NULL) < 0) {
printk("amiga_chip_alloc_res: first alloc failed!\n"); pr_err("amiga_chip_alloc_res: first alloc failed!\n");
if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX, if (allocate_resource(&chipram_res, res, size, 0, UINT_MAX,
PAGE_SIZE, NULL, NULL) < 0) PAGE_SIZE, NULL, NULL) < 0)
return NULL; return NULL;
} }
chipavail -= size; chipavail -= size;
#ifdef DEBUG pr_debug("amiga_chip_alloc_res: returning %pR\n", res);
printk("amiga_chip_alloc_res: returning %lx\n", res->start);
#endif
return (void *)ZTWO_VADDR(res->start); return (void *)ZTWO_VADDR(res->start);
} }
...@@ -113,14 +105,12 @@ void amiga_chip_free(void *ptr) ...@@ -113,14 +105,12 @@ void amiga_chip_free(void *ptr)
continue; continue;
*p = res->sibling; *p = res->sibling;
size = res->end-start; size = res->end-start;
#ifdef DEBUG pr_debug("amiga_chip_free: free %lu bytes at %p\n", size, ptr);
printk("amiga_chip_free: free %ld bytes at %p\n", size, ptr);
#endif
chipavail += size; chipavail += size;
kfree(res); kfree(res);
return; return;
} }
printk("amiga_chip_free: trying to free nonexistent region at %p\n", pr_err("amiga_chip_free: trying to free nonexistent region at %p\n",
ptr); ptr);
} }
EXPORT_SYMBOL(amiga_chip_free); EXPORT_SYMBOL(amiga_chip_free);
...@@ -128,9 +118,7 @@ EXPORT_SYMBOL(amiga_chip_free); ...@@ -128,9 +118,7 @@ EXPORT_SYMBOL(amiga_chip_free);
unsigned long amiga_chip_avail(void) unsigned long amiga_chip_avail(void)
{ {
#ifdef DEBUG pr_debug("amiga_chip_avail : %lu bytes\n", chipavail);
printk("amiga_chip_avail : %ld bytes\n", chipavail);
#endif
return chipavail; return chipavail;
} }
EXPORT_SYMBOL(amiga_chip_avail); EXPORT_SYMBOL(amiga_chip_avail);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment