aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSachin Kamat <sachin.kamat@linaro.org>2012-11-14 22:43:29 -0500
committerDave Airlie <airlied@redhat.com>2012-11-20 00:35:27 -0500
commitd56b1b9d48fe266685eb6025c979150e86bb2c6d (patch)
tree9f49117381a12ad0d0643ac1df7d5a7972937dc1
parent6c91083f8e8867a39c70a6448b014478d2acfc48 (diff)
drm/fb_helper: Convert printk to pr_* and dev_*
Converted printks to pr_* and dev_* to silence checkpatch warnings. Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r--drivers/gpu/drm/drm_fb_helper.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index 9b60e93e0a68..07cba5af59f0 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -27,6 +27,8 @@
27 * Dave Airlie <airlied@linux.ie> 27 * Dave Airlie <airlied@linux.ie>
28 * Jesse Barnes <jesse.barnes@intel.com> 28 * Jesse Barnes <jesse.barnes@intel.com>
29 */ 29 */
30#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
31
30#include <linux/kernel.h> 32#include <linux/kernel.h>
31#include <linux/sysrq.h> 33#include <linux/sysrq.h>
32#include <linux/slab.h> 34#include <linux/slab.h>
@@ -271,7 +273,7 @@ int drm_fb_helper_panic(struct notifier_block *n, unsigned long ununsed,
271 if (panic_timeout < 0) 273 if (panic_timeout < 0)
272 return 0; 274 return 0;
273 275
274 printk(KERN_ERR "panic occurred, switching back to text console\n"); 276 pr_err("panic occurred, switching back to text console\n");
275 return drm_fb_helper_force_kernel_mode(); 277 return drm_fb_helper_force_kernel_mode();
276} 278}
277EXPORT_SYMBOL(drm_fb_helper_panic); 279EXPORT_SYMBOL(drm_fb_helper_panic);
@@ -439,7 +441,7 @@ void drm_fb_helper_fini(struct drm_fb_helper *fb_helper)
439 if (!list_empty(&fb_helper->kernel_fb_list)) { 441 if (!list_empty(&fb_helper->kernel_fb_list)) {
440 list_del(&fb_helper->kernel_fb_list); 442 list_del(&fb_helper->kernel_fb_list);
441 if (list_empty(&kernel_fb_helper_list)) { 443 if (list_empty(&kernel_fb_helper_list)) {
442 printk(KERN_INFO "drm: unregistered panic notifier\n"); 444 pr_info("drm: unregistered panic notifier\n");
443 atomic_notifier_chain_unregister(&panic_notifier_list, 445 atomic_notifier_chain_unregister(&panic_notifier_list,
444 &paniced); 446 &paniced);
445 unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op); 447 unregister_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
@@ -810,8 +812,8 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
810 return -EINVAL; 812 return -EINVAL;
811 } 813 }
812 814
813 printk(KERN_INFO "fb%d: %s frame buffer device\n", info->node, 815 dev_info(fb_helper->dev->dev, "fb%d: %s frame buffer device\n",
814 info->fix.id); 816 info->node, info->fix.id);
815 817
816 } else { 818 } else {
817 drm_fb_helper_set_par(info); 819 drm_fb_helper_set_par(info);
@@ -820,7 +822,7 @@ int drm_fb_helper_single_fb_probe(struct drm_fb_helper *fb_helper,
820 /* Switch back to kernel console on panic */ 822 /* Switch back to kernel console on panic */
821 /* multi card linked list maybe */ 823 /* multi card linked list maybe */
822 if (list_empty(&kernel_fb_helper_list)) { 824 if (list_empty(&kernel_fb_helper_list)) {
823 printk(KERN_INFO "drm: registered panic notifier\n"); 825 dev_info(fb_helper->dev->dev, "registered panic notifier\n");
824 atomic_notifier_chain_register(&panic_notifier_list, 826 atomic_notifier_chain_register(&panic_notifier_list,
825 &paniced); 827 &paniced);
826 register_sysrq_key('v', &sysrq_drm_fb_helper_restore_op); 828 register_sysrq_key('v', &sysrq_drm_fb_helper_restore_op);
@@ -1326,7 +1328,7 @@ bool drm_fb_helper_initial_config(struct drm_fb_helper *fb_helper, int bpp_sel)
1326 * we shouldn't end up with no modes here. 1328 * we shouldn't end up with no modes here.
1327 */ 1329 */
1328 if (count == 0) { 1330 if (count == 0) {
1329 printk(KERN_INFO "No connectors reported connected with modes\n"); 1331 dev_info(fb_helper->dev->dev, "No connectors reported connected with modes\n");
1330 } 1332 }
1331 drm_setup_crtcs(fb_helper); 1333 drm_setup_crtcs(fb_helper);
1332 1334