1 files changed, 4 insertions, 22 deletions

diff --git a/drivers/rtc/rtc-s3c.c b/drivers/rtc/rtc-s3c.c
index 75c8c5033e08..04c68178c42d 100644
--- a/drivers/rtc/rtc-s3c.c
+++ b/drivers/rtc/rtc-s3c.c
@@ -225,13 +225,9 @@ retry_get_time:
         s3c_rtc_disable_clk(info);
 
         rtc_tm->tm_year += 100;
-
-        dev_dbg(dev, "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;
 
+        dev_dbg(dev, "read time %ptR\n", rtc_tm);
         return 0;
 }
 
@@ -241,9 +237,7 @@ static int s3c_rtc_settime(struct device *dev, struct rtc_time *tm)
         int year = tm->tm_year - 100;
         int ret;
 
-        dev_dbg(dev, "set time %04d.%02d.%02d %02d:%02d:%02d\n",
-                1900 + tm->tm_year, tm->tm_mon, tm->tm_mday,
-                tm->tm_hour, tm->tm_min, tm->tm_sec);
+        dev_dbg(dev, "set time %ptR\n", tm);
 
         /* we get around y2k by simply not supporting it */
 
@@ -292,10 +286,7 @@ static int s3c_rtc_getalarm(struct device *dev, struct rtc_wkalrm *alrm)
 
         alrm->enabled = (alm_en & S3C2410_RTCALM_ALMEN) ? 1 : 0;
 
-        dev_dbg(dev, "read alarm %d, %04d.%02d.%02d %02d:%02d:%02d\n",
-                alm_en,
-                1900 + alm_tm->tm_year, alm_tm->tm_mon, alm_tm->tm_mday,
-                alm_tm->tm_hour, alm_tm->tm_min, alm_tm->tm_sec);
+        dev_dbg(dev, "read alarm %d, %ptR\n", alm_en, alm_tm);
 
         /* decode the alarm enable field */
         if (alm_en & S3C2410_RTCALM_SECEN)
@@ -327,12 +318,8 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
         struct rtc_time *tm = &alrm->time;
         unsigned int alrm_en;
         int ret;
-        int year = tm->tm_year - 100;
 
-        dev_dbg(dev, "s3c_rtc_setalarm: %d, %04d.%02d.%02d %02d:%02d:%02d\n",
-                alrm->enabled,
-                1900 + tm->tm_year, tm->tm_mon + 1, tm->tm_mday,
-                tm->tm_hour, tm->tm_min, tm->tm_sec);
+        dev_dbg(dev, "s3c_rtc_setalarm: %d, %ptR\n", alrm->enabled, tm);
 
         ret = s3c_rtc_enable_clk(info);
         if (ret)
@@ -356,11 +343,6 @@ static int s3c_rtc_setalarm(struct device *dev, struct rtc_wkalrm *alrm)
                 writeb(bin2bcd(tm->tm_hour), info->base + S3C2410_ALMHOUR);
         }
 
-        if (year < 100 && year >= 0) {
-                alrm_en |= S3C2410_RTCALM_YEAREN;
-                writeb(bin2bcd(year), info->base + S3C2410_ALMYEAR);
-        }
-
         if (tm->tm_mon < 12 && tm->tm_mon >= 0) {
                 alrm_en |= S3C2410_RTCALM_MONEN;
                 writeb(bin2bcd(tm->tm_mon + 1), info->base + S3C2410_ALMMON);