diff options
author | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-02-28 04:19:14 -0500 |
---|---|---|
committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-05-21 09:06:11 -0400 |
commit | 6b6f770b573903f8a7d1cfab1fc662685653f413 (patch) | |
tree | 033a393bb5e59562a3941c00a2cfc0acfefe7f08 /arch/arm/mm/dma-mapping.c | |
parent | 47142f07eea32e9c108f548a4b06c28bec7df6e4 (diff) |
ARM: dma-mapping: use pr_* instread of printk
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>
Diffstat (limited to 'arch/arm/mm/dma-mapping.c')
-rw-r--r-- | arch/arm/mm/dma-mapping.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 7ec08636fda5..322c70a0190b 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c | |||
@@ -184,14 +184,14 @@ static int __init consistent_init(void) | |||
184 | 184 | ||
185 | pud = pud_alloc(&init_mm, pgd, base); | 185 | pud = pud_alloc(&init_mm, pgd, base); |
186 | if (!pud) { | 186 | if (!pud) { |
187 | printk(KERN_ERR "%s: no pud tables\n", __func__); | 187 | pr_err("%s: no pud tables\n", __func__); |
188 | ret = -ENOMEM; | 188 | ret = -ENOMEM; |
189 | break; | 189 | break; |
190 | } | 190 | } |
191 | 191 | ||
192 | pmd = pmd_alloc(&init_mm, pud, base); | 192 | pmd = pmd_alloc(&init_mm, pud, base); |
193 | if (!pmd) { | 193 | if (!pmd) { |
194 | printk(KERN_ERR "%s: no pmd tables\n", __func__); | 194 | pr_err("%s: no pmd tables\n", __func__); |
195 | ret = -ENOMEM; | 195 | ret = -ENOMEM; |
196 | break; | 196 | break; |
197 | } | 197 | } |
@@ -199,7 +199,7 @@ static int __init consistent_init(void) | |||
199 | 199 | ||
200 | pte = pte_alloc_kernel(pmd, base); | 200 | pte = pte_alloc_kernel(pmd, base); |
201 | if (!pte) { | 201 | if (!pte) { |
202 | printk(KERN_ERR "%s: no pte tables\n", __func__); | 202 | pr_err("%s: no pte tables\n", __func__); |
203 | ret = -ENOMEM; | 203 | ret = -ENOMEM; |
204 | break; | 204 | break; |
205 | } | 205 | } |
@@ -222,7 +222,7 @@ __dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot, | |||
222 | int bit; | 222 | int bit; |
223 | 223 | ||
224 | if (!consistent_pte) { | 224 | if (!consistent_pte) { |
225 | printk(KERN_ERR "%s: not initialised\n", __func__); | 225 | pr_err("%s: not initialised\n", __func__); |
226 | dump_stack(); | 226 | dump_stack(); |
227 | return NULL; | 227 | return NULL; |
228 | } | 228 | } |
@@ -281,14 +281,14 @@ static void __dma_free_remap(void *cpu_addr, size_t size) | |||
281 | 281 | ||
282 | c = arm_vmregion_find_remove(&consistent_head, (unsigned long)cpu_addr); | 282 | c = arm_vmregion_find_remove(&consistent_head, (unsigned long)cpu_addr); |
283 | if (!c) { | 283 | if (!c) { |
284 | printk(KERN_ERR "%s: trying to free invalid coherent area: %p\n", | 284 | pr_err("%s: trying to free invalid coherent area: %p\n", |
285 | __func__, cpu_addr); | 285 | __func__, cpu_addr); |
286 | dump_stack(); | 286 | dump_stack(); |
287 | return; | 287 | return; |
288 | } | 288 | } |
289 | 289 | ||
290 | if ((c->vm_end - c->vm_start) != size) { | 290 | if ((c->vm_end - c->vm_start) != size) { |
291 | printk(KERN_ERR "%s: freeing wrong coherent size (%ld != %d)\n", | 291 | pr_err("%s: freeing wrong coherent size (%ld != %d)\n", |
292 | __func__, c->vm_end - c->vm_start, size); | 292 | __func__, c->vm_end - c->vm_start, size); |
293 | dump_stack(); | 293 | dump_stack(); |
294 | size = c->vm_end - c->vm_start; | 294 | size = c->vm_end - c->vm_start; |
@@ -310,8 +310,8 @@ static void __dma_free_remap(void *cpu_addr, size_t size) | |||
310 | } | 310 | } |
311 | 311 | ||
312 | if (pte_none(pte) || !pte_present(pte)) | 312 | if (pte_none(pte) || !pte_present(pte)) |
313 | printk(KERN_CRIT "%s: bad page in kernel page table\n", | 313 | pr_crit("%s: bad page in kernel page table\n", |
314 | __func__); | 314 | __func__); |
315 | } while (size -= PAGE_SIZE); | 315 | } while (size -= PAGE_SIZE); |
316 | 316 | ||
317 | flush_tlb_kernel_range(c->vm_start, c->vm_end); | 317 | flush_tlb_kernel_range(c->vm_start, c->vm_end); |