diff options
author | Jingoo Han <jg1.han@samsung.com> | 2013-02-21 19:45:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:22:29 -0500 |
commit | ee4433573b02f817c3ac62ed8f07027938dc9201 (patch) | |
tree | 74172cb91ff444f84cfdb83fd55da2841de3eb63 /drivers/rtc | |
parent | 79d134058f15e25c6b6724704a8f046c2ff6c1f9 (diff) |
rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
Fix the checkpatch warning as below:
WARNING: Prefer netdev_err(netdev, ... then dev_err(dev, ... then pr_err(... to printk(KERN_ERR ...
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>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-cmos.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/rtc/rtc-cmos.c b/drivers/rtc/rtc-cmos.c index 9deb9e47a67c..af97c94e8a3a 100644 --- a/drivers/rtc/rtc-cmos.c +++ b/drivers/rtc/rtc-cmos.c | |||
@@ -706,7 +706,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) | |||
706 | rtc_cmos_int_handler = hpet_rtc_interrupt; | 706 | rtc_cmos_int_handler = hpet_rtc_interrupt; |
707 | err = hpet_register_irq_handler(cmos_interrupt); | 707 | err = hpet_register_irq_handler(cmos_interrupt); |
708 | if (err != 0) { | 708 | if (err != 0) { |
709 | printk(KERN_WARNING "hpet_register_irq_handler " | 709 | dev_warn(dev, "hpet_register_irq_handler " |
710 | " failed in rtc_init()."); | 710 | " failed in rtc_init()."); |
711 | goto cleanup1; | 711 | goto cleanup1; |
712 | } | 712 | } |
@@ -731,8 +731,7 @@ cmos_do_probe(struct device *dev, struct resource *ports, int rtc_irq) | |||
731 | goto cleanup2; | 731 | goto cleanup2; |
732 | } | 732 | } |
733 | 733 | ||
734 | pr_info("%s: %s%s, %zd bytes nvram%s\n", | 734 | dev_info(dev, "%s%s, %zd bytes nvram%s\n", |
735 | dev_name(&cmos_rtc.rtc->dev), | ||
736 | !is_valid_irq(rtc_irq) ? "no alarms" : | 735 | !is_valid_irq(rtc_irq) ? "no alarms" : |
737 | cmos_rtc.mon_alrm ? "alarms up to one year" : | 736 | cmos_rtc.mon_alrm ? "alarms up to one year" : |
738 | cmos_rtc.day_alrm ? "alarms up to one month" : | 737 | cmos_rtc.day_alrm ? "alarms up to one month" : |
@@ -820,8 +819,7 @@ static int cmos_suspend(struct device *dev) | |||
820 | enable_irq_wake(cmos->irq); | 819 | enable_irq_wake(cmos->irq); |
821 | } | 820 | } |
822 | 821 | ||
823 | pr_debug("%s: suspend%s, ctrl %02x\n", | 822 | dev_dbg(dev, "suspend%s, ctrl %02x\n", |
824 | dev_name(&cmos_rtc.rtc->dev), | ||
825 | (tmp & RTC_AIE) ? ", alarm may wake" : "", | 823 | (tmp & RTC_AIE) ? ", alarm may wake" : "", |
826 | tmp); | 824 | tmp); |
827 | 825 | ||
@@ -876,9 +874,7 @@ static int cmos_resume(struct device *dev) | |||
876 | spin_unlock_irq(&rtc_lock); | 874 | spin_unlock_irq(&rtc_lock); |
877 | } | 875 | } |
878 | 876 | ||
879 | pr_debug("%s: resume, ctrl %02x\n", | 877 | dev_dbg(dev, "resume, ctrl %02x\n", tmp); |
880 | dev_name(&cmos_rtc.rtc->dev), | ||
881 | tmp); | ||
882 | 878 | ||
883 | return 0; | 879 | return 0; |
884 | } | 880 | } |