On 16/06/2020 10:38:00+0200, Bruno Thomsen wrote:
> > +static int pcf2127_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
> > +{
> > + struct pcf2127 *pcf2127 = dev_get_drvdata(dev);
> > + unsigned int buf[5], ctrl2;
> > + int ret;
> > +
> > + ret = regmap_read(pcf2127->regmap, PCF2127_REG_CTRL2, &ctrl2);
> > + if (ret) {
> > + dev_err(dev, "%s: ctrl2 read error\n", __func__);
> > + return ret;
> > + }
> > +
> > + ret = pcf2127_wdt_active_ping(&pcf2127->wdd);
> > + if (ret)
> > + return ret;
> > +
> > + ret = regmap_bulk_read(pcf2127->regmap, PCF2127_REG_ALARM_SC, buf,
> > + sizeof(buf));
> > + if (ret) {
> > + dev_err(dev, "%s: alarm read error\n", __func__);
> > + return ret;
> > + }
> > +
> > + alrm->enabled = ctrl2 & PCF2127_BIT_CTRL2_AIE;
> > + alrm->pending = ctrl2 & PCF2127_BIT_CTRL2_AF;
> > +
> > + alrm->time.tm_sec = bcd2bin(buf[0] & 0x7F);
> > + alrm->time.tm_min = bcd2bin(buf[1] & 0x7F);
> > + alrm->time.tm_hour = bcd2bin(buf[2] & 0x3F);
> > + alrm->time.tm_mday = bcd2bin(buf[3] & 0x3F);
> > + alrm->time.tm_wday = buf[4] & 0x07;
> > +
> > + dev_dbg(dev, "%s: alarm is %d:%d:%d, mday=%d, wday=%d\n", __func__,
> > + alrm->time.tm_hour, alrm->time.tm_min, alrm->time.tm_sec,
> > + alrm->time.tm_mday, alrm->time.tm_wday);
> > +
> > + return 0;
> > +}
> > +
> > +static int pcf2127_rtc_alarm_irq_enable(struct device *dev, u32 enable)
> > +{
> > + struct pcf2127 *pcf2127 = dev_get_drvdata(dev);
> > + int ret;
> > +
> > + ret = regmap_update_bits(pcf2127->regmap, PCF2127_REG_CTRL2,
> > + PCF2127_BIT_CTRL2_AIE,
> > + enable ? PCF2127_BIT_CTRL2_AIE : 0);
> > + if (ret) {
> > + dev_err(dev, "%s: failed to %s alarm (%d)\n", __func__,
> > + enable ? "enable" : "disable",
> > + ret);
> > + return ret;
> > + }
> > +
> > + ret = pcf2127_wdt_active_ping(&pcf2127->wdd);
> > + if (ret)
> > + return ret;
> > +
> > + return 0;
>
> Just do "return ret;" unconditional.
>
Just return pcf2127_wdt_active_ping(&pcf2127->wdd);
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
