tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

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>

authored by

Joe Perches and committed by
Daniel Vetter 499447db 4e8be453

+9 -10
+6 -6
drivers/gpu/drm/drm_cache.c
··· 88 88 } 89 89 90 90 if (wbinvd_on_all_cpus()) 91 - printk(KERN_ERR "Timed out waiting for cache flush.\n"); 91 + pr_err("Timed out waiting for cache flush\n"); 92 92 93 93 #elif defined(__powerpc__) 94 94 unsigned long i; ··· 105 105 kunmap_atomic(page_virtual); 106 106 } 107 107 #else 108 - printk(KERN_ERR "Architecture has no drm_cache.c support\n"); 108 + pr_err("Architecture has no drm_cache.c support\n"); 109 109 WARN_ON_ONCE(1); 110 110 #endif 111 111 } ··· 134 134 } 135 135 136 136 if (wbinvd_on_all_cpus()) 137 - printk(KERN_ERR "Timed out waiting for cache flush.\n"); 137 + pr_err("Timed out waiting for cache flush\n"); 138 138 #else 139 - printk(KERN_ERR "Architecture has no drm_cache.c support\n"); 139 + pr_err("Architecture has no drm_cache.c support\n"); 140 140 WARN_ON_ONCE(1); 141 141 #endif 142 142 } ··· 167 167 } 168 168 169 169 if (wbinvd_on_all_cpus()) 170 - printk(KERN_ERR "Timed out waiting for cache flush.\n"); 170 + pr_err("Timed out waiting for cache flush\n"); 171 171 #else 172 - printk(KERN_ERR "Architecture has no drm_cache.c support\n"); 172 + pr_err("Architecture has no drm_cache.c support\n"); 173 173 WARN_ON_ONCE(1); 174 174 #endif 175 175 }
+2 -2
drivers/gpu/drm/drm_edid.c
··· 1167 1167 bad: 1168 1168 if (print_bad_edid) { 1169 1169 if (drm_edid_is_zero(raw_edid, EDID_LENGTH)) { 1170 - printk(KERN_NOTICE "EDID block is all zeroes\n"); 1170 + pr_notice("EDID block is all zeroes\n"); 1171 1171 } else { 1172 - printk(KERN_NOTICE "Raw EDID:\n"); 1172 + pr_notice("Raw EDID:\n"); 1173 1173 print_hex_dump(KERN_NOTICE, 1174 1174 " \t", DUMP_PREFIX_NONE, 16, 1, 1175 1175 raw_edid, EDID_LENGTH, false);
+1 -2
drivers/gpu/drm/drm_ioc32.c
··· 257 257 258 258 m32.handle = (unsigned long)handle; 259 259 if (m32.handle != (unsigned long)handle) 260 - printk_ratelimited(KERN_ERR "compat_drm_addmap truncated handle" 261 - " %p for type %d offset %x\n", 260 + pr_err_ratelimited("compat_drm_addmap truncated handle %p for type %d offset %x\n", 262 261 handle, m32.type, m32.offset); 263 262 264 263 if (copy_to_user(argp, &m32, sizeof(m32)))