Message ID | 20190430093212.28425-3-alexandre.belloni@bootlin.com (mailing list archive) |
---|---|
State | Mainlined, archived |
Commit | 72ef256e3a06d4116f83c9fc9974182deae6289a |
Headers | show |
Series | [1/4] rtc: digicolor: fix possible race condition | expand |
Hi Alexandre, On Tue, Apr 30 2019, Alexandre Belloni wrote: > Use .set_time instead of the deprecated .set_mmss. > > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Acked-by: Baruch Siach <baruch@tkos.co.il> baruch > --- > drivers/rtc/rtc-digicolor.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/rtc/rtc-digicolor.c b/drivers/rtc/rtc-digicolor.c > index e6e16aaac254..ed2fc1adafd5 100644 > --- a/drivers/rtc/rtc-digicolor.c > +++ b/drivers/rtc/rtc-digicolor.c > @@ -106,11 +106,11 @@ static int dc_rtc_read_time(struct device *dev, struct rtc_time *tm) > return 0; > } > > -static int dc_rtc_set_mmss(struct device *dev, unsigned long secs) > +static int dc_rtc_set_time(struct device *dev, struct rtc_time *tm) > { > struct dc_rtc *rtc = dev_get_drvdata(dev); > > - return dc_rtc_write(rtc, secs); > + return dc_rtc_write(rtc, rtc_tm_to_time64(tm)); > } > > static int dc_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) > @@ -161,7 +161,7 @@ static int dc_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) > > static const struct rtc_class_ops dc_rtc_ops = { > .read_time = dc_rtc_read_time, > - .set_mmss = dc_rtc_set_mmss, > + .set_time = dc_rtc_set_time, > .read_alarm = dc_rtc_read_alarm, > .set_alarm = dc_rtc_set_alarm, > .alarm_irq_enable = dc_rtc_alarm_irq_enable,
diff --git a/drivers/rtc/rtc-digicolor.c b/drivers/rtc/rtc-digicolor.c index e6e16aaac254..ed2fc1adafd5 100644 --- a/drivers/rtc/rtc-digicolor.c +++ b/drivers/rtc/rtc-digicolor.c @@ -106,11 +106,11 @@ static int dc_rtc_read_time(struct device *dev, struct rtc_time *tm) return 0; } -static int dc_rtc_set_mmss(struct device *dev, unsigned long secs) +static int dc_rtc_set_time(struct device *dev, struct rtc_time *tm) { struct dc_rtc *rtc = dev_get_drvdata(dev); - return dc_rtc_write(rtc, secs); + return dc_rtc_write(rtc, rtc_tm_to_time64(tm)); } static int dc_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alarm) @@ -161,7 +161,7 @@ static int dc_rtc_alarm_irq_enable(struct device *dev, unsigned int enabled) static const struct rtc_class_ops dc_rtc_ops = { .read_time = dc_rtc_read_time, - .set_mmss = dc_rtc_set_mmss, + .set_time = dc_rtc_set_time, .read_alarm = dc_rtc_read_alarm, .set_alarm = dc_rtc_set_alarm, .alarm_irq_enable = dc_rtc_alarm_irq_enable,
Use .set_time instead of the deprecated .set_mmss. Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> --- drivers/rtc/rtc-digicolor.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)