Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 499447db authored by Joe Perches's avatar Joe Perches Committed by Daniel Vetter
Browse files

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: default avatarJoe Perches <joe@perches.com>
[danvet: Resolve minor conflict in drm_edid.c]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4e8be453

drivers/gpu/drm/drm_cache.c

+6 −6
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) 
	}



	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__)

	unsigned long i;
@@ -105,7 +105,7 @@ drm_clflush_pages(struct page *pages[], unsigned long num_pages) 
		kunmap_atomic(page_virtual);

	}

#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);

#endif

}
@@ -134,9 +134,9 @@ drm_clflush_sg(struct sg_table *st) 
	}



	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

	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);

#endif

}
@@ -167,9 +167,9 @@ drm_clflush_virt_range(void *addr, unsigned long length) 
	}



	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

	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);

#endif

}

drivers/gpu/drm/drm_edid.c

+2 −2
Original line number Diff line number Diff line
@@ -1167,9 +1167,9 @@ bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, 
bad:

	if (print_bad_edid) {

		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 {

			printk(KERN_NOTICE "Raw EDID:\n");

			pr_notice("Raw EDID:\n");

			print_hex_dump(KERN_NOTICE,

				       " \t", DUMP_PREFIX_NONE, 16, 1,

				       raw_edid, EDID_LENGTH, false);

drivers/gpu/drm/drm_ioc32.c

+1 −2
Original line number Diff line number Diff line
@@ -257,8 +257,7 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, 


	m32.handle = (unsigned long)handle;

	if (m32.handle != (unsigned long)handle)

		printk_ratelimited(KERN_ERR "compat_drm_addmap truncated handle"

				   " %p for type %d offset %x\n",

		pr_err_ratelimited("compat_drm_addmap truncated handle %p for type %d offset %x\n",

				   handle, m32.type, m32.offset);



	if (copy_to_user(argp, &m32, sizeof(m32)))