diff options
| -rw-r--r-- | drivers/mfd/glamo/glamo-fb.c | 4 | ||||
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 4 | ||||
| -rw-r--r-- | include/linux/resume-dependency.h | 16 |
3 files changed, 12 insertions, 12 deletions
diff --git a/drivers/mfd/glamo/glamo-fb.c b/drivers/mfd/glamo/glamo-fb.c index 1ebb87d1276..44ab9a39787 100644 --- a/drivers/mfd/glamo/glamo-fb.c +++ b/drivers/mfd/glamo/glamo-fb.c @@ -1061,7 +1061,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); - dev_info(&pdev->dev, "spin_lock_init\n"); + dev_dbg(&pdev->dev, "spin_lock_init\n"); spin_lock_init(&glamofb->lock_cmd); glamofb_init_regs(glamofb); #ifdef CONFIG_MFD_GLAMO_HWACCEL @@ -1148,7 +1148,7 @@ static int glamofb_resume(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_dbg(&pdev->dev, "spin_lock_init\n"); spin_lock_init(&gfb->lock_cmd); glamofb_init_regs(gfb); #ifdef CONFIG_MFD_GLAMO_HWACCEL diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index bc3ed66d43c..acf16360cfd 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -616,7 +616,7 @@ static void glamo_mci_send_request(struct mmc_host *mmc) int insanity_timeout = 1000000; if (host->suspending) { - dev_err(&host->pdev->dev, "IGNORING glamo_mci_send_request while " + dev_dbg(&host->pdev->dev, "REFUSING glamo_mci_send_request while " "suspended\n"); cmd->error = -EIO; if (cmd->data) @@ -774,7 +774,7 @@ static void glamo_mci_request(struct mmc_host *mmc, struct mmc_request *mrq) static void glamo_mci_reset(struct glamo_mci_host *host) { if (host->suspending) { - dev_err(&host->pdev->dev, "IGNORING glamo_mci_reset while " + dev_info(&host->pdev->dev, "IGNORING glamo_mci_reset while " "suspended\n"); return; } diff --git a/include/linux/resume-dependency.h b/include/linux/resume-dependency.h index 46cc1d1c6da..f84bf618205 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_INFO "##### init_resume_dependency_list(head=%p)\n", (_head)); \ + printk(KERN_DEBUG "##### init_resume_dependency_list(head=%p)\n", (_head)); \ INIT_LIST_HEAD(&(_head)->list); @@ -52,13 +52,13 @@ struct resume_dependency { struct list_head *_pos, *_q; \ struct resume_dependency *_d; \ \ - printk(KERN_ERR "##### register_resume_dependency(head=%p, dep=%p)\n", (_head), (_dep)); \ + printk(KERN_DEBUG "##### register_resume_dependency(head=%p, dep=%p)\n", (_head), (_dep)); \ (_dep)->called_flag = 1; \ list_for_each_safe(_pos, _q, &((_head)->list)) { \ _d = list_entry(_pos, struct resume_dependency, list); \ if (_d == (_dep)) { \ list_del(_pos); \ - printk(KERN_ERR "##### duplicate dependency removed first\n"); \ + printk(KERN_DEBUG "##### duplicate dependency removed first\n"); \ } \ } \ list_add(&(_dep)->list, &(_head)->list); \ @@ -73,12 +73,12 @@ struct resume_dependency { struct list_head *_pos, *_q; \ struct resume_dependency *_dep; \ \ - printk(KERN_ERR "##### callback_all_resume_dependencies(head=%p)\n", (_head)); \ + printk(KERN_DEBUG "##### callback_all_resume_dependencies(head=%p)\n", (_head)); \ list_for_each_safe(_pos, _q, &((_head)->list)) { \ _dep = list_entry(_pos, struct resume_dependency, list); \ - printk(KERN_ERR "##### callback list entry (head=%p, dep=%p)\n", (_head), (_dep)); \ + printk(KERN_DEBUG "##### callback list entry (head=%p, dep=%p)\n", (_head), (_dep)); \ _dep->called_flag = 1; \ - printk(KERN_ERR "##### callback=%p(context=%p))\n", (_dep->callback),(_dep->context)); \ + printk(KERN_DEBUG "##### callback=%p(context=%p))\n", (_dep->callback),(_dep->context)); \ (_dep->callback)(_dep->context); \ list_del(_pos); \ } \ @@ -97,10 +97,10 @@ struct resume_dependency { struct list_head *_pos, *_q; \ struct resume_dependency *_dep; \ \ - printk(KERN_ERR "##### activate_all_resume_dependencies(head=%p)\n", (_head)); \ + printk(KERN_DEBUG "##### activate_all_resume_dependencies(head=%p)\n", (_head)); \ list_for_each_safe(_pos, _q, &((_head)->list)) { \ _dep = list_entry(_pos, struct resume_dependency, list); \ - printk(KERN_ERR "##### activating callback list entry (head=%p, dep=%p)\n", (_head), (_dep)); \ + printk(KERN_DEBUG "##### activating callback list entry (head=%p, dep=%p)\n", (_head), (_dep)); \ _dep->called_flag = 0; \ } \ } |