diff options
Diffstat (limited to 'drivers/rtc/interface.c')
| -rw-r--r-- | drivers/rtc/interface.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/rtc/interface.c b/drivers/rtc/interface.c index 37215cf983e9..166fc60d8b55 100644 --- a/drivers/rtc/interface.c +++ b/drivers/rtc/interface.c | |||
| @@ -31,13 +31,14 @@ static int __rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm) | |||
| 31 | memset(tm, 0, sizeof(struct rtc_time)); | 31 | memset(tm, 0, sizeof(struct rtc_time)); |
| 32 | err = rtc->ops->read_time(rtc->dev.parent, tm); | 32 | err = rtc->ops->read_time(rtc->dev.parent, tm); |
| 33 | if (err < 0) { | 33 | if (err < 0) { |
| 34 | dev_err(&rtc->dev, "read_time: fail to read\n"); | 34 | dev_dbg(&rtc->dev, "read_time: fail to read: %d\n", |
| 35 | err); | ||
| 35 | return err; | 36 | return err; |
| 36 | } | 37 | } |
| 37 | 38 | ||
| 38 | err = rtc_valid_tm(tm); | 39 | err = rtc_valid_tm(tm); |
| 39 | if (err < 0) | 40 | if (err < 0) |
| 40 | dev_err(&rtc->dev, "read_time: rtc_time isn't valid\n"); | 41 | dev_dbg(&rtc->dev, "read_time: rtc_time isn't valid\n"); |
| 41 | } | 42 | } |
| 42 | return err; | 43 | return err; |
| 43 | } | 44 | } |
| @@ -72,7 +73,11 @@ int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm) | |||
| 72 | err = -ENODEV; | 73 | err = -ENODEV; |
| 73 | else if (rtc->ops->set_time) | 74 | else if (rtc->ops->set_time) |
| 74 | err = rtc->ops->set_time(rtc->dev.parent, tm); | 75 | err = rtc->ops->set_time(rtc->dev.parent, tm); |
| 75 | else if (rtc->ops->set_mmss) { | 76 | else if (rtc->ops->set_mmss64) { |
| 77 | time64_t secs64 = rtc_tm_to_time64(tm); | ||
| 78 | |||
| 79 | err = rtc->ops->set_mmss64(rtc->dev.parent, secs64); | ||
| 80 | } else if (rtc->ops->set_mmss) { | ||
| 76 | time64_t secs64 = rtc_tm_to_time64(tm); | 81 | time64_t secs64 = rtc_tm_to_time64(tm); |
| 77 | err = rtc->ops->set_mmss(rtc->dev.parent, secs64); | 82 | err = rtc->ops->set_mmss(rtc->dev.parent, secs64); |
| 78 | } else | 83 | } else |
| @@ -96,6 +101,8 @@ int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs) | |||
| 96 | 101 | ||
| 97 | if (!rtc->ops) | 102 | if (!rtc->ops) |
| 98 | err = -ENODEV; | 103 | err = -ENODEV; |
| 104 | else if (rtc->ops->set_mmss64) | ||
| 105 | err = rtc->ops->set_mmss64(rtc->dev.parent, secs); | ||
| 99 | else if (rtc->ops->set_mmss) | 106 | else if (rtc->ops->set_mmss) |
| 100 | err = rtc->ops->set_mmss(rtc->dev.parent, secs); | 107 | err = rtc->ops->set_mmss(rtc->dev.parent, secs); |
| 101 | else if (rtc->ops->read_time && rtc->ops->set_time) { | 108 | else if (rtc->ops->read_time && rtc->ops->set_time) { |
