Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e8896cd authored by MyungJoo Ham's avatar MyungJoo Ham Committed by Linus Torvalds
Browse files

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: default avatarMyungJoo Ham <myungjoo.ham@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Changhwan Youn <chaos.youn@samsung.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1424e21f

drivers/rtc/rtc-s3c.c

+6 −6
Original line number Diff line number Diff line
@@ -152,10 +152,6 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm) 
		goto retry_get_time;

	}



	pr_debug("read time %04d.%02d.%02d %02d:%02d:%02d\n",

		 1900 + rtc_tm->tm_year, rtc_tm->tm_mon, rtc_tm->tm_mday,

		 rtc_tm->tm_hour, rtc_tm->tm_min, rtc_tm->tm_sec);



	rtc_tm->tm_sec = bcd2bin(rtc_tm->tm_sec);

	rtc_tm->tm_min = bcd2bin(rtc_tm->tm_min);

	rtc_tm->tm_hour = bcd2bin(rtc_tm->tm_hour);
@@ -164,6 +160,11 @@ static int s3c_rtc_gettime(struct device *dev, struct rtc_time *rtc_tm) 
	rtc_tm->tm_year = bcd2bin(rtc_tm->tm_year);



	rtc_tm->tm_year += 100;



	pr_debug("read time %04d.%02d.%02d %02d:%02d:%02d\n",

		 1900 + rtc_tm->tm_year, rtc_tm->tm_mon, rtc_tm->tm_mday,

		 rtc_tm->tm_hour, rtc_tm->tm_min, rtc_tm->tm_sec);



	rtc_tm->tm_mon -= 1;



	clk_disable(rtc_clk);
@@ -269,10 +270,9 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm) 
	clk_enable(rtc_clk);

	pr_debug("s3c_rtc_setalarm: %d, %04d.%02d.%02d %02d:%02d:%02d\n",

		 alrm->enabled,

		 1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,

		 1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,

		 tm->tm_hour, tm->tm_min, tm->tm_sec);





	alrm_en = readb(base + S3C2410_RTCALM) & S3C2410_RTCALM_ALMEN;

	writeb(0x00, base + S3C2410_RTCALM);