Replaced printks with dev_* and pr_* routines. Replacing printk in __suspend_report_result() will require passing in struct device * pointer from calling routines and this will require changes to external interface suspend_report_result() which is used by several drivers. Hence, this one instance is replaced by pr_err().
Signed-off-by: Shuah Khan <[email protected]> --- drivers/base/power/main.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 9f098a8..3f42c43 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -349,8 +349,8 @@ static void pm_dev_dbg(struct device *dev, pm_message_t state, char *info) static void pm_dev_err(struct device *dev, pm_message_t state, char *info, int error) { - printk(KERN_ERR "PM: Device %s failed to %s%s: error %d\n", - dev_name(dev), pm_verb(state.event), info, error); + dev_err(dev, "PM: failed to %s%s: error %d\n", + pm_verb(state.event), info, error); } static void dpm_show_time(ktime_t starttime, pm_message_t state, char *info) @@ -1308,9 +1308,8 @@ int dpm_prepare(pm_message_t state) error = 0; continue; } - printk(KERN_INFO "PM: Device %s not prepared " - "for power transition: code %d\n", - dev_name(dev), error); + dev_info("PM: not prepared for power transition: ", + "code %d\n", error); put_device(dev); break; } @@ -1347,7 +1346,7 @@ EXPORT_SYMBOL_GPL(dpm_suspend_start); void __suspend_report_result(const char *function, void *fn, int ret) { if (ret) - printk(KERN_ERR "%s(): %pF returns %d\n", function, fn, ret); + pr_err("%s(): %pF returns %d\n", function, fn, ret); } EXPORT_SYMBOL_GPL(__suspend_report_result); -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
