From 9cd47fc6ed270b4daae8ddce0932d669cd461e8a Mon Sep 17 00:00:00 2001 From: Andy Green Date: Mon, 1 Dec 2008 01:26:32 +0000 Subject: fix-err-strength-debug-msg.patch Now Qi is changed to default to loglevel 4 where it will show KERN_ERR on LCM, we need to reduce the debugging KERN_ERR traffic so as not to obscure the real things. Signed-off-by: Andy Green --- drivers/mfd/glamo/glamo-fb.c | 8 +++++--- drivers/mfd/glamo/glamo-mci.c | 6 +++--- drivers/video/console/fbcon.c | 2 +- include/linux/resume-dependency.h | 2 +- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index b4b121e4c6c..64fe464fa46 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -333,7 +333,8 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo, return; } - printk(KERN_ERR"glamofb_update_lcd_controller spin_lock_irqsave\n"); + dev_dbg(&glamo->mach_info->glamo->pdev->dev, + "glamofb_update_lcd_controller spin_lock_irqsave\n"); spin_lock_irqsave(&glamo->lock_cmd, flags); if (glamofb_cmd_mode(glamo, 1)) @@ -426,7 +427,8 @@ static void glamofb_update_lcd_controller(struct glamofb_handle *glamo, glamofb_cmd_mode(glamo, 0); out_unlock: - printk(KERN_ERR"glamofb_update_lcd_controller spin_unlock_irqrestore\n"); + dev_dbg(&glamo->mach_info->glamo->pdev->dev, + "glamofb_update_lcd_controller spin_unlock_irqrestore\n"); spin_unlock_irqrestore(&glamo->lock_cmd, flags); } @@ -920,7 +922,7 @@ static int __init glamofb_probe(struct platform_device *pdev) glamo_engine_enable(mach_info->glamo, GLAMO_ENGINE_LCD); glamo_engine_reset(mach_info->glamo, GLAMO_ENGINE_LCD); - printk(KERN_ERR"spin_lock_init\n"); + dev_info(&pdev->dev, "spin_lock_init\n"); spin_lock_init(&glamofb->lock_cmd); glamofb_init_regs(glamofb); #ifdef CONFIG_MFD_GLAMO_HWACCEL diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index 5079796ba28..e5bef30463b 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -368,7 +368,7 @@ static void glamo_mci_irq(unsigned int irq, struct irq_desc *desc) GLAMO_STAT1_MMC_BRERR)) cmd->error = -EILSEQ; if (cmd->error) { - dev_err(&host->pdev->dev, "Error after cmd: 0x%x\n", status); + dev_info(&host->pdev->dev, "Error after cmd: 0x%x\n", status); goto done; } @@ -655,7 +655,7 @@ static void glamo_mci_send_request(struct mmc_host *mmc) goto bail; if (cmd->error) { - dev_err(&host->pdev->dev, "Error after cmd: 0x%x\n", status); + dev_info(&host->pdev->dev, "Error after cmd: 0x%x\n", status); goto done; } /* @@ -743,7 +743,7 @@ static void glamo_mci_reset(struct glamo_mci_host *host) "suspended\n"); return; } - dev_err(&host->pdev->dev, "******* glamo_mci_reset\n"); + dev_dbg(&host->pdev->dev, "******* glamo_mci_reset\n"); /* reset MMC controller */ writew(GLAMO_CLOCK_MMC_RESET | GLAMO_CLOCK_MMC_DG_TCLK | GLAMO_CLOCK_MMC_EN_TCLK | GLAMO_CLOCK_MMC_DG_M9CLK | diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c index 285acaeafe8..e45dc2ce116 100644 --- a/drivers/video/console/fbcon.c +++ b/drivers/video/console/fbcon.c @@ -3238,7 +3238,7 @@ static int fbcon_event_notify(struct notifier_block *self, struct fb_blit_caps *caps; int ret = 0; - printk(KERN_ERR "fbcon_event_notify action=%ld, data=%p\n", action, data); + printk(KERN_INFO "fbcon_event_notify action=%ld, data=%p\n", action, data); event = data; info = event->info; diff --git a/include/linux/resume-dependency.h b/include/linux/resume-dependency.h index 959cadd8365..46cc1d1c6da 100644 --- a/include/linux/resume-dependency.h +++ b/include/linux/resume-dependency.h @@ -38,7 +38,7 @@ struct resume_dependency { */ #define init_resume_dependency_list(_head) \ - printk(KERN_ERR "##### init_resume_dependency_list(head=%p)\n", (_head)); \ + printk(KERN_INFO "##### init_resume_dependency_list(head=%p)\n", (_head)); \ INIT_LIST_HEAD(&(_head)->list); -- cgit v1.2.3