Skip to content

Commit

Permalink
ARM: dma-mapping: use pr_* instread of printk
Browse files Browse the repository at this point in the history
Replace all calls to printk with pr_* functions family.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-By: Subash Patel <subash.ramaswamy@linaro.org>
  • Loading branch information
Marek Szyprowski committed May 21, 2012
1 parent 47142f0 commit 6b6f770
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions arch/arm/mm/dma-mapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,22 +184,22 @@ static int __init consistent_init(void)

pud = pud_alloc(&init_mm, pgd, base);
if (!pud) {
printk(KERN_ERR "%s: no pud tables\n", __func__);
pr_err("%s: no pud tables\n", __func__);
ret = -ENOMEM;
break;
}

pmd = pmd_alloc(&init_mm, pud, base);
if (!pmd) {
printk(KERN_ERR "%s: no pmd tables\n", __func__);
pr_err("%s: no pmd tables\n", __func__);
ret = -ENOMEM;
break;
}
WARN_ON(!pmd_none(*pmd));

pte = pte_alloc_kernel(pmd, base);
if (!pte) {
printk(KERN_ERR "%s: no pte tables\n", __func__);
pr_err("%s: no pte tables\n", __func__);
ret = -ENOMEM;
break;
}
Expand All @@ -222,7 +222,7 @@ __dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot,
int bit;

if (!consistent_pte) {
printk(KERN_ERR "%s: not initialised\n", __func__);
pr_err("%s: not initialised\n", __func__);
dump_stack();
return NULL;
}
Expand Down Expand Up @@ -281,14 +281,14 @@ static void __dma_free_remap(void *cpu_addr, size_t size)

c = arm_vmregion_find_remove(&consistent_head, (unsigned long)cpu_addr);
if (!c) {
printk(KERN_ERR "%s: trying to free invalid coherent area: %p\n",
pr_err("%s: trying to free invalid coherent area: %p\n",
__func__, cpu_addr);
dump_stack();
return;
}

if ((c->vm_end - c->vm_start) != size) {
printk(KERN_ERR "%s: freeing wrong coherent size (%ld != %d)\n",
pr_err("%s: freeing wrong coherent size (%ld != %d)\n",
__func__, c->vm_end - c->vm_start, size);
dump_stack();
size = c->vm_end - c->vm_start;
Expand All @@ -310,8 +310,8 @@ static void __dma_free_remap(void *cpu_addr, size_t size)
}

if (pte_none(pte) || !pte_present(pte))
printk(KERN_CRIT "%s: bad page in kernel page table\n",
__func__);
pr_crit("%s: bad page in kernel page table\n",
__func__);
} while (size -= PAGE_SIZE);

flush_tlb_kernel_range(c->vm_start, c->vm_end);
Expand Down

0 comments on commit 6b6f770

Please sign in to comment.