diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-04-29 19:18:32 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-29 21:28:22 -0400 |
commit | e2bf1151edcdb44e9e871e90e7331dc760c9f856 (patch) | |
tree | 8b769f2274626292a56bd5b06198875dbaf19ac1 | |
parent | ac60bf31210f7b388ea2c1de62ef573a45f49a0f (diff) |
drivers/rtc/rtc-max77686.c: use dev_info()/dev_emerg() instead of pr_info()/pr_emerg()
dev_info()/dev_emerg() are preferred to pr_info()/pr_emerg().
Signed-off-by: Jingoo Han <jg1.han@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/rtc/rtc-max77686.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/rtc/rtc-max77686.c b/drivers/rtc/rtc-max77686.c index 9de93e72a18a..df66babfc157 100644 --- a/drivers/rtc/rtc-max77686.c +++ b/drivers/rtc/rtc-max77686.c | |||
@@ -466,7 +466,7 @@ static void max77686_rtc_enable_smpl(struct max77686_rtc_info *info, bool enable | |||
466 | 466 | ||
467 | val = 0; | 467 | val = 0; |
468 | regmap_read(info->max77686->rtc_regmap, MAX77686_WTSR_SMPL_CNTL, &val); | 468 | regmap_read(info->max77686->rtc_regmap, MAX77686_WTSR_SMPL_CNTL, &val); |
469 | pr_info("%s: WTSR_SMPL(0x%02x)\n", __func__, val); | 469 | dev_info(info->dev, "%s: WTSR_SMPL(0x%02x)\n", __func__, val); |
470 | } | 470 | } |
471 | #endif /* MAX77686_RTC_WTSR_SMPL */ | 471 | #endif /* MAX77686_RTC_WTSR_SMPL */ |
472 | 472 | ||
@@ -589,11 +589,14 @@ static void max77686_rtc_shutdown(struct platform_device *pdev) | |||
589 | for (i = 0; i < 3; i++) { | 589 | for (i = 0; i < 3; i++) { |
590 | max77686_rtc_enable_wtsr(info, false); | 590 | max77686_rtc_enable_wtsr(info, false); |
591 | regmap_read(info->max77686->rtc_regmap, MAX77686_WTSR_SMPL_CNTL, &val); | 591 | regmap_read(info->max77686->rtc_regmap, MAX77686_WTSR_SMPL_CNTL, &val); |
592 | pr_info("%s: WTSR_SMPL reg(0x%02x)\n", __func__, val); | 592 | dev_info(info->dev, "%s: WTSR_SMPL reg(0x%02x)\n", __func__, |
593 | if (val & WTSR_EN_MASK) | 593 | val); |
594 | pr_emerg("%s: fail to disable WTSR\n", __func__); | 594 | if (val & WTSR_EN_MASK) { |
595 | else { | 595 | dev_emerg(info->dev, "%s: fail to disable WTSR\n", |
596 | pr_info("%s: success to disable WTSR\n", __func__); | 596 | __func__); |
597 | } else { | ||
598 | dev_info(info->dev, "%s: success to disable WTSR\n", | ||
599 | __func__); | ||
597 | break; | 600 | break; |
598 | } | 601 | } |
599 | } | 602 | } |