tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

drivers/rtc/rtc-s3c.c: correct debug messages

RTC-S3C used to print out debug messages incorrectly. This patch
corrects incorrect outputs. (undecoded bcd numbers, incorrectly decoded
register values)

This patch affects the pr-debug messages only.

Signed-off-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

MyungJoo Ham and committed by
Linus Torvalds 4e8896cd 1424e21f

+6 -6
+6 -6
drivers/rtc/rtc-s3c.c
··· 152 152 goto retry_get_time; 153 153 } 154 154 155 - pr_debug("read time %04d.%02d.%02d %02d:%02d:%02d\n", 156 - 1900 + rtc_tm->tm_year, rtc_tm->tm_mon, rtc_tm->tm_mday, 157 - rtc_tm->tm_hour, rtc_tm->tm_min, rtc_tm->tm_sec); 158 - 159 155 rtc_tm->tm_sec = bcd2bin(rtc_tm->tm_sec); 160 156 rtc_tm->tm_min = bcd2bin(rtc_tm->tm_min); 161 157 rtc_tm->tm_hour = bcd2bin(rtc_tm->tm_hour); ··· 160 164 rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year); 161 165 162 166 rtc_tm->tm_year += 100; 167 + 168 + pr_debug("read time %04d.%02d.%02d %02d:%02d:%02d\n", 169 + 1900 + rtc_tm->tm_year, rtc_tm->tm_mon, rtc_tm->tm_mday, 170 + rtc_tm->tm_hour, rtc_tm->tm_min, rtc_tm->tm_sec); 171 + 163 172 rtc_tm->tm_mon -= 1; 164 173 165 174 clk_disable(rtc_clk); ··· 270 269 clk_enable(rtc_clk); 271 270 pr_debug("s3c_rtc_setalarm: %d, %04d.%02d.%02d %02d:%02d:%02d\n", 272 271 alrm->enabled, 273 - 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday, 272 + 1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday, 274 273 tm->tm_hour, tm->tm_min, tm->tm_sec); 275 - 276 274 277 275 alrm_en = readb(base + S3C2410_RTCALM) & S3C2410_RTCALM_ALMEN; 278 276 writeb(0x00, base + S3C2410_RTCALM);