Hi, It's the same as https://patchwork.ozlabs.org/patch/1257381/, so both commit is fine. thanks 发件人：Alexandre Belloni <alexandre.belloni@xxxxxxxxxxx> 发送日期：2020-03-21 21:21:25 收件人："韩科才" <hankecai@xxxxxxxx> 抄送人：a.zummo@xxxxxxxxxxxx,linux-rtc@xxxxxxxxxxxxxxx,linux-kernel@xxxxxxxxxxxxxxx,trivial@xxxxxxxxxx,kernel@xxxxxxxx 主题：Re: [PATCH] rtc: pm8xxx: clear alarm register when alarm is not enabled>Hi, > >Isn't that the same as: >https://patchwork.ozlabs.org/patch/1257381/ ? > >On 21/03/2020 19:50:17+0800, 韩科才 wrote: >> Clear alarm register when alarm is not enabled otherwise the consumer >> may still start alarm timer if it find the alarm register is not zero. >> >> Signed-off-by: hankecai <hankecai@xxxxxxxx> >> --- >> drivers/rtc/rtc-pm8xxx.c | 11 +++++++++++ >> 1 file changed, 11 insertions(+) >> >> diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c >> index 07ea1be3abb9..3fa5416ad90d 100644 >> --- a/drivers/rtc/rtc-pm8xxx.c >> +++ b/drivers/rtc/rtc-pm8xxx.c >> @@ -301,6 +301,7 @@ static int pm8xxx_rtc_alarm_irq_enable(struct device *dev, unsigned int enable) >> struct pm8xxx_rtc *rtc_dd = dev_get_drvdata(dev); >> const struct pm8xxx_rtc_regs *regs = rtc_dd->regs; >> unsigned int ctrl_reg; >> + u8 value[NUM_8_BIT_RTC_REGS] = {0}; >> >> spin_lock_irqsave(&rtc_dd->ctrl_reg_lock, irq_flags); >> >> @@ -319,6 +320,16 @@ static int pm8xxx_rtc_alarm_irq_enable(struct device *dev, unsigned int enable) >> goto rtc_rw_fail; >> } >> >> + /* Clear Alarm register */ >> + if (!enable) { >> + rc = regmap_bulk_write(rtc_dd->regmap, regs->alarm_rw, value, >> + sizeof(value)); >> + if (rc) { >> + dev_err(dev, "Clear RTC ALARM register failed\n"); >> + goto rtc_rw_fail; >> + } >> + } >> + >> rtc_rw_fail: >> spin_unlock_irqrestore(&rtc_dd->ctrl_reg_lock, irq_flags); >> return rc; >> -- >> 2.21.0 >> >> >> > >-- >Alexandre Belloni, Bootlin >Embedded Linux and Kernel engineering >https://bootlin.com
