diff options
author | Johan Hovold <johan@kernel.org> | 2014-12-10 18:52:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-10 20:41:13 -0500 |
commit | 397b630a6757eb5c0adda115a1560c586957e2d8 (patch) | |
tree | 14183173eeb8ab0ba7f3082205ab483582e56a75 /drivers/rtc | |
parent | 8777340a5635d66e7d89267b80a0817cbfb289a0 (diff) |
rtc: omap: use dev_info
Use dev_info rather than pr_info.
Signed-off-by: Johan Hovold <johan@kernel.org>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Benot Cousson <bcousson@baylibre.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Tero Kristo <t-kristo@ti.com>
Cc: Keerthy J <j-keerthy@ti.com>
Tested-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-omap.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index c750678de652..dbb88e46c25d 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c | |||
@@ -427,8 +427,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev) | |||
427 | /* clear old status */ | 427 | /* clear old status */ |
428 | reg = rtc_read(OMAP_RTC_STATUS_REG); | 428 | reg = rtc_read(OMAP_RTC_STATUS_REG); |
429 | if (reg & (u8) OMAP_RTC_STATUS_POWER_UP) { | 429 | if (reg & (u8) OMAP_RTC_STATUS_POWER_UP) { |
430 | pr_info("%s: RTC power up reset detected\n", | 430 | dev_info(&pdev->dev, "RTC power up reset detected\n"); |
431 | pdev->name); | ||
432 | rtc_write(OMAP_RTC_STATUS_POWER_UP, OMAP_RTC_STATUS_REG); | 431 | rtc_write(OMAP_RTC_STATUS_POWER_UP, OMAP_RTC_STATUS_REG); |
433 | } | 432 | } |
434 | if (reg & (u8) OMAP_RTC_STATUS_ALARM) | 433 | if (reg & (u8) OMAP_RTC_STATUS_ALARM) |
@@ -437,7 +436,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev) | |||
437 | /* On boards with split power, RTC_ON_NOFF won't reset the RTC */ | 436 | /* On boards with split power, RTC_ON_NOFF won't reset the RTC */ |
438 | reg = rtc_read(OMAP_RTC_CTRL_REG); | 437 | reg = rtc_read(OMAP_RTC_CTRL_REG); |
439 | if (reg & (u8) OMAP_RTC_CTRL_STOP) | 438 | if (reg & (u8) OMAP_RTC_CTRL_STOP) |
440 | pr_info("%s: already running\n", pdev->name); | 439 | dev_info(&pdev->dev, "already running\n"); |
441 | 440 | ||
442 | /* force to 24 hour mode */ | 441 | /* force to 24 hour mode */ |
443 | new_ctrl = reg & (OMAP_RTC_CTRL_SPLIT|OMAP_RTC_CTRL_AUTO_COMP); | 442 | new_ctrl = reg & (OMAP_RTC_CTRL_SPLIT|OMAP_RTC_CTRL_AUTO_COMP); |
@@ -458,7 +457,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev) | |||
458 | */ | 457 | */ |
459 | 458 | ||
460 | if (new_ctrl & (u8) OMAP_RTC_CTRL_SPLIT) | 459 | if (new_ctrl & (u8) OMAP_RTC_CTRL_SPLIT) |
461 | pr_info("%s: split power mode\n", pdev->name); | 460 | dev_info(&pdev->dev, "split power mode\n"); |
462 | 461 | ||
463 | if (reg != new_ctrl) | 462 | if (reg != new_ctrl) |
464 | rtc_write(new_ctrl, OMAP_RTC_CTRL_REG); | 463 | rtc_write(new_ctrl, OMAP_RTC_CTRL_REG); |