Merge tag 'nios2-v5.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2

[linux.git] / drivers / rtc / rtc-s5m.c

diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index 6495f84f74288cfda5e2a26274dbdedb152531b2..eb9dde4095a99b811160159534d3429f0c48291b 100644 (file)
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -406,9 +406,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
                return -EINVAL;
        }
 
-       dev_dbg(dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
-               1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday,
-               tm->tm_hour, tm->tm_min, tm->tm_sec, tm->tm_wday);
+       dev_dbg(dev, "%s: %ptR(%d)\n", __func__, tm, tm->tm_wday);
 
        return 0;
 }
@@ -436,9 +434,7 @@ static int s5m_rtc_set_time(struct device *dev, struct rtc_time *tm)
        if (ret < 0)
                return ret;
 
-       dev_dbg(dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
-               1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday,
-               tm->tm_hour, tm->tm_min, tm->tm_sec, tm->tm_wday);
+       dev_dbg(dev, "%s: %ptR(%d)\n", __func__, tm, tm->tm_wday);
 
        ret = regmap_raw_write(info->regmap, info->regs->time, data,
                        info->regs->regs_count);
@@ -490,11 +486,7 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
                return -EINVAL;
        }
 
-       dev_dbg(dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
-               1900 + alrm->time.tm_year, 1 + alrm->time.tm_mon,
-               alrm->time.tm_mday, alrm->time.tm_hour,
-               alrm->time.tm_min, alrm->time.tm_sec,
-               alrm->time.tm_wday);
+       dev_dbg(dev, "%s: %ptR(%d)\n", __func__, &alrm->time, alrm->time.tm_wday);
 
        ret = s5m_check_peding_alarm_interrupt(info, alrm);
 
@@ -513,9 +505,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info)
                return ret;
 
        s5m8767_data_to_tm(data, &tm, info->rtc_24hr_mode);
-       dev_dbg(info->dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
-               1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday,
-               tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_wday);
+       dev_dbg(info->dev, "%s: %ptR(%d)\n", __func__, &tm, tm.tm_wday);
 
        switch (info->device_type) {
        case S5M8763X:
@@ -558,9 +548,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info)
                return ret;
 
        s5m8767_data_to_tm(data, &tm, info->rtc_24hr_mode);
-       dev_dbg(info->dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
-               1900 + tm.tm_year, 1 + tm.tm_mon, tm.tm_mday,
-               tm.tm_hour, tm.tm_min, tm.tm_sec, tm.tm_wday);
+       dev_dbg(info->dev, "%s: %ptR(%d)\n", __func__, &tm, tm.tm_wday);
 
        switch (info->device_type) {
        case S5M8763X:
@@ -620,10 +608,7 @@ static int s5m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
                return -EINVAL;
        }
 
-       dev_dbg(dev, "%s: %d/%d/%d %d:%d:%d(%d)\n", __func__,
-               1900 + alrm->time.tm_year, 1 + alrm->time.tm_mon,
-               alrm->time.tm_mday, alrm->time.tm_hour, alrm->time.tm_min,
-               alrm->time.tm_sec, alrm->time.tm_wday);
+       dev_dbg(dev, "%s: %ptR(%d)\n", __func__, &alrm->time, alrm->time.tm_wday);
 
        ret = s5m_rtc_stop_alarm(info);
        if (ret < 0)
@@ -775,10 +760,10 @@ static int s5m_rtc_probe(struct platform_device *pdev)
                return -ENODEV;
        }
 
-       info->i2c = i2c_new_dummy(s5m87xx->i2c->adapter, RTC_I2C_ADDR);
-       if (!info->i2c) {
+       info->i2c = i2c_new_dummy_device(s5m87xx->i2c->adapter, RTC_I2C_ADDR);
+       if (IS_ERR(info->i2c)) {
                dev_err(&pdev->dev, "Failed to allocate I2C for RTC\n");
-               return -ENODEV;
+               return PTR_ERR(info->i2c);
        }
 
        info->regmap = devm_regmap_init_i2c(info->i2c, regmap_cfg);