Commit eb245631 authored Feb 02, 2023 by Johan Hovold Committed by Alexandre Belloni Feb 09, 2023

rtc: pm8xxx: drop spmi error messages



Drop the unnecessary error messages after every spmi regmap access,
which are not expected to fail.

Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20230202155448.6715-3-johan+linaro@kernel.org


Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

parent c88db0ef

drivers/rtc/rtc-pm8xxx.c

+17 −54

Original line number	Diff line number	Diff line
		@@ -105,11 +105,9 @@ static int pm8xxx_rtc_set_time(struct device dev, struct rtc_time tm)
		alarm_enabled = 1;
		ctrl_reg &= ~regs->alarm_en;
		rc = regmap_write(rtc_dd->regmap, regs->alarm_ctrl, ctrl_reg);
		if (rc) {
		dev_err(dev, "Write to RTC Alarm control register failed\n");
		if (rc)
		goto rtc_rw_fail;
		}
		}

		/* Disable RTC H/w before writing on RTC register */
		rc = regmap_read(rtc_dd->regmap, regs->ctrl, &rtc_ctrl_reg);
		@@ -120,52 +118,40 @@ static int pm8xxx_rtc_set_time(struct device dev, struct rtc_time tm)
		rtc_disabled = 1;
		rtc_ctrl_reg &= ~PM8xxx_RTC_ENABLE;
		rc = regmap_write(rtc_dd->regmap, regs->ctrl, rtc_ctrl_reg);
		if (rc) {
		dev_err(dev, "Write to RTC control register failed\n");
		if (rc)
		goto rtc_rw_fail;
		}
		}

		/* Write 0 to Byte[0] */
		rc = regmap_write(rtc_dd->regmap, regs->write, 0);
		if (rc) {
		dev_err(dev, "Write to RTC write data register failed\n");
		if (rc)
		goto rtc_rw_fail;
		}

		/* Write Byte[1], Byte[2], Byte[3] */
		rc = regmap_bulk_write(rtc_dd->regmap, regs->write + 1,
		&value[1], sizeof(value) - 1);
		if (rc) {
		dev_err(dev, "Write to RTC write data register failed\n");
		if (rc)
		goto rtc_rw_fail;
		}

		/* Write Byte[0] */
		rc = regmap_write(rtc_dd->regmap, regs->write, value[0]);
		if (rc) {
		dev_err(dev, "Write to RTC write data register failed\n");
		if (rc)
		goto rtc_rw_fail;
		}

		/* Enable RTC H/w after writing on RTC register */
		if (rtc_disabled) {
		rtc_ctrl_reg \|= PM8xxx_RTC_ENABLE;
		rc = regmap_write(rtc_dd->regmap, regs->ctrl, rtc_ctrl_reg);
		if (rc) {
		dev_err(dev, "Write to RTC control register failed\n");
		if (rc)
		goto rtc_rw_fail;
		}
		}

		if (alarm_enabled) {
		ctrl_reg \|= regs->alarm_en;
		rc = regmap_write(rtc_dd->regmap, regs->alarm_ctrl, ctrl_reg);
		if (rc) {
		dev_err(dev, "Write to RTC Alarm control register failed\n");
		if (rc)
		goto rtc_rw_fail;
		}
		}

		rtc_rw_fail:
		spin_unlock_irqrestore(&rtc_dd->ctrl_reg_lock, irq_flags);
		@@ -183,29 +169,23 @@ static int pm8xxx_rtc_read_time(struct device dev, struct rtc_time tm)
		const struct pm8xxx_rtc_regs *regs = rtc_dd->regs;

		rc = regmap_bulk_read(rtc_dd->regmap, regs->read, value, sizeof(value));
		if (rc) {
		dev_err(dev, "RTC read data register failed\n");
		if (rc)
		return rc;
		}

		/*
		* Read the LSB again and check if there has been a carry over.
		* If there is, redo the read operation.
		*/
		rc = regmap_read(rtc_dd->regmap, regs->read, &reg);
		if (rc < 0) {
		dev_err(dev, "RTC read data register failed\n");
		if (rc < 0)
		return rc;
		}

		if (unlikely(reg < value[0])) {
		rc = regmap_bulk_read(rtc_dd->regmap, regs->read,
		value, sizeof(value));
		if (rc) {
		dev_err(dev, "RTC read data register failed\n");
		if (rc)
		return rc;
		}
		}

		secs = value[0] \| (value[1] << 8) \| (value[2] << 16) \|
		((unsigned long)value[3] << 24);
		@@ -241,10 +221,8 @@ static int pm8xxx_rtc_set_alarm(struct device dev, struct rtc_wkalrm alarm)

		rc = regmap_bulk_write(rtc_dd->regmap, regs->alarm_rw, value,
		sizeof(value));
		if (rc) {
		dev_err(dev, "Write to RTC ALARM register failed\n");
		if (rc)
		goto rtc_rw_fail;
		}

		if (alarm->enabled) {
		rc = regmap_update_bits(rtc_dd->regmap, regs->alarm_ctrl,
		@@ -271,10 +249,8 @@ static int pm8xxx_rtc_read_alarm(struct device dev, struct rtc_wkalrm alarm)

		rc = regmap_bulk_read(rtc_dd->regmap, regs->alarm_rw, value,
		sizeof(value));
		if (rc) {
		dev_err(dev, "RTC alarm time read failed\n");
		if (rc)
		return rc;
		}

		secs = value[0] \| (value[1] << 8) \| (value[2] << 16) \|
		((unsigned long)value[3] << 24);
		@@ -282,10 +258,9 @@ static int pm8xxx_rtc_read_alarm(struct device dev, struct rtc_wkalrm alarm)
		rtc_time64_to_tm(secs, &alarm->time);

		rc = regmap_read(rtc_dd->regmap, regs->alarm_ctrl, &ctrl_reg);
		if (rc) {
		dev_err(dev, "Read from RTC alarm control register failed\n");
		if (rc)
		return rc;
		}

		alarm->enabled = !!(ctrl_reg & PM8xxx_RTC_ALARM_ENABLE);

		dev_dbg(dev, "Alarm set for - h:m:s=%ptRt, y-m-d=%ptRdr\n",
		@@ -315,20 +290,16 @@ static int pm8xxx_rtc_alarm_irq_enable(struct device *dev, unsigned int enable)
		ctrl_reg &= ~regs->alarm_en;

		rc = regmap_write(rtc_dd->regmap, regs->alarm_ctrl, ctrl_reg);
		if (rc) {
		dev_err(dev, "Write to RTC control register failed\n");
		if (rc)
		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");
		if (rc)
		goto rtc_rw_fail;
		}
		}

		rtc_rw_fail:
		spin_unlock_irqrestore(&rtc_dd->ctrl_reg_lock, irq_flags);
		@@ -366,8 +337,6 @@ static irqreturn_t pm8xxx_alarm_trigger(int irq, void *dev_id)
		rc = regmap_write(rtc_dd->regmap, regs->alarm_ctrl, ctrl_reg);
		if (rc) {
		spin_unlock(&rtc_dd->ctrl_reg_lock);
		dev_err(rtc_dd->rtc_dev,
		"Write to alarm control register failed\n");
		goto rtc_alarm_handled;
		}

		@@ -375,17 +344,11 @@ static irqreturn_t pm8xxx_alarm_trigger(int irq, void *dev_id)

		/* Clear RTC alarm register */
		rc = regmap_read(rtc_dd->regmap, regs->alarm_ctrl2, &ctrl_reg);
		if (rc) {
		dev_err(rtc_dd->rtc_dev,
		"RTC Alarm control2 register read failed\n");
		if (rc)
		goto rtc_alarm_handled;
		}

		ctrl_reg \|= PM8xxx_RTC_ALARM_CLEAR;
		rc = regmap_write(rtc_dd->regmap, regs->alarm_ctrl2, ctrl_reg);
		if (rc)
		dev_err(rtc_dd->rtc_dev,
		"Write to RTC Alarm control2 register failed\n");

		rtc_alarm_handled:
		return IRQ_HANDLED;