Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gpu: drm: core: Convert printk(KERN_<LEVEL> to pr_<level>

Browse source 
Use a more common logging style.

Miscellanea:

o Coalesce formats and realign arguments

Signed-off-by: Joe Perches <joe@perches.com>
[danvet: Resolve minor conflict in drm_edid.c]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Joe Perches 2017-02-28 04:55:53 -08:00 committed by Daniel Vetter
parent 4e8be453a4
commit 499447db0e
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/gpu/drm/drm_cache.c
View file

@ -88,7 +88,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
} }
if (wbinvd_on_all_cpus()) if (wbinvd_on_all_cpus())
printk(KERN_ERR "Timed out waiting for cache flush.\n"); pr_err("Timed out waiting for cache flush\n");
#elif defined(__powerpc__) #elif defined(__powerpc__)
unsigned long i; unsigned long i;
@ -105,7 +105,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages)
kunmap_atomic(page_virtual); kunmap_atomic(page_virtual);
} }
#else #else
printk(KERN_ERR "Architecture has no drm_cache.c support\n"); pr_err("Architecture has no drm_cache.c support\n");
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
#endif #endif
} }
@ -134,9 +134,9 @@ drm_clflush_sg(struct sg_table *st)
} }
if (wbinvd_on_all_cpus()) if (wbinvd_on_all_cpus())
printk(KERN_ERR "Timed out waiting for cache flush.\n"); pr_err("Timed out waiting for cache flush\n");
#else #else
printk(KERN_ERR "Architecture has no drm_cache.c support\n"); pr_err("Architecture has no drm_cache.c support\n");
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
#endif #endif
} }
@ -167,9 +167,9 @@ drm_clflush_virt_range(void *addr, unsigned long length)
} }
if (wbinvd_on_all_cpus()) if (wbinvd_on_all_cpus())
printk(KERN_ERR "Timed out waiting for cache flush.\n"); pr_err("Timed out waiting for cache flush\n");
#else #else
printk(KERN_ERR "Architecture has no drm_cache.c support\n"); pr_err("Architecture has no drm_cache.c support\n");
WARN_ON_ONCE(1); WARN_ON_ONCE(1);
#endif #endif
} }

4
drivers/gpu/drm/drm_edid.c
View file

@ -1167,9 +1167,9 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid,
bad: bad:
if (print_bad_edid) { if (print_bad_edid) {
if (drm_edid_is_zero(raw_edid, EDID_LENGTH)) { if (drm_edid_is_zero(raw_edid, EDID_LENGTH)) {
printk(KERN_NOTICE "EDID block is all zeroes\n"); pr_notice("EDID block is all zeroes\n");
} else { } else {
printk(KERN_NOTICE "Raw EDID:\n"); pr_notice("Raw EDID:\n");
print_hex_dump(KERN_NOTICE, print_hex_dump(KERN_NOTICE,
" \t", DUMP_PREFIX_NONE, 16, 1, " \t", DUMP_PREFIX_NONE, 16, 1,
raw_edid, EDID_LENGTH, false); raw_edid, EDID_LENGTH, false);

3
drivers/gpu/drm/drm_ioc32.c
View file

@ -257,8 +257,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd,
m32.handle = (unsigned long)handle; m32.handle = (unsigned long)handle;
if (m32.handle != (unsigned long)handle) if (m32.handle != (unsigned long)handle)
printk_ratelimited(KERN_ERR "compat_drm_addmap truncated handle" pr_err_ratelimited("compat_drm_addmap truncated handle %p for type %d offset %x\n",
" %p for type %d offset %x\n",
handle, m32.type, m32.offset); handle, m32.type, m32.offset);
if (copy_to_user(argp, &m32, sizeof(m32))) if (copy_to_user(argp, &m32, sizeof(m32)))