diff options
| author | Thomas White <taw@bitwiz.org.uk> | 2009-08-27 21:02:14 +0100 |
|---|---|---|
| committer | Thomas White <taw@bitwiz.org.uk> | 2009-08-27 21:02:14 +0100 |
| commit | 4c4019bcdb3de577846384a519be08b5059cf4c2 (patch) | |
| tree | 5811db09f629ac2df91b21145ad8673feb2063f2 | |
| parent | ab3f0330837d7c059d9bcd4134af3de5fa84d161 (diff) | |
Silence suspend/resume
This removes a few excess printks to tidy up suspend/resume.
Identical changes exist in andy-tracking already
Signed-off-by: Thomas White <taw@bitwiz.org.uk>
| -rw-r--r-- | drivers/mfd/glamo/glamo-mci.c | 2 | ||||
| -rw-r--r-- | include/linux/resume-dependency.h | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c index b9442091d02..398f8634a9b 100644 --- a/drivers/mfd/glamo/glamo-mci.c +++ b/drivers/mfd/glamo/glamo-mci.c @@ -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..2b87af8cac7 100644 --- a/include/linux/resume-dependency.h +++ b/include/linux/resume-dependency.h @@ -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; \ } \ } |