From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E03D52E05C for ; Mon, 7 Sep 2026 20:34:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788813258; cv=none; b=SK95DDtamw23w+Vip8oGaZfJB6RljcGbFH+4slhXKHff69M2viv6sFpAqVQzJWD8fHg9AXBnX1fwnV+fxhWO6rgepNHGxIpshsQCpRBQMbtcAMSC4Xz8N1oI8B/wVoFCrmYch1LE5Bh7UNGDOFnt+g7Q4xmgzpW9VoPTuGcEWlY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788813258; c=relaxed/simple; bh=JZEmXowo7mfUOL+CnzAnogoZn2/XPy4YsiLFUq8ifEU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sM6YB3rL8bwBL5Hm3wLdLILqLfWLh/9gsa0P78hDPhz43Mo7FroUgbTVhTUsC5GefWW2W6H7AXqfCdD8WWx0b7AhgpYLA0cCFQ+6OTazhpsPfzV7Bm/rcXKjWW+VorFAMB1jxpxRHRmYiI8MnZorbz4OmioVfQUL6F8eCa7864E= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=nuHraoQ4; arc=none smtp.client-ip=209.85.221.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="nuHraoQ4" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-482e4998d28so3125166f8f.2 for ; Mon, 07 Sep 2026 13:34:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1788813253; x=1789418053; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=aiiGHwZbZuUKXZE7eoiXYRpECDB5XUxWTkzTLV8BBq0=; b=nuHraoQ4JzFu4fjXkL9KK4Ls29VEF3TpPCWdAzfP5ClXTezx0g1VojjvS+V2MZXBaK NeaNsdu7B6oypn+1Cu6mDxLUmY6ytHi7/p/526X5iur5yvIAjE2L+yOzn8nAPtMc9iwq aq7kROtmscr6bz6U75XQTGf/M08ltZ+c1O2WSx5SQzUAgSavm6rWXmCZpmSO1BLT/oKs VhJDKEfewhZk0Xqp7nMeo14En0OW+krWTZhXb2URJ0ZBGp5j6iGCNWSETRPv0BKT9Ztr kqPZKkpVNg2fgxjBLREsVDQpRA6DfdCpIsbWvsB/qXPa3Cng32aRj9S1EXCeLQ29lXA0 0MHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1788813253; x=1789418053; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=aiiGHwZbZuUKXZE7eoiXYRpECDB5XUxWTkzTLV8BBq0=; b=gk/3+Bac51GAqqxaGqLtzYUqGYBX+kjY6T+hD3wPUKSA723YHOSZdj/5bOmJvRbSYU QzYIi6F62lof4Zl4zaw/rIOJ7OeJxqXkvqWyVv1eOpwEe+Um31RyI2cVuLidjPAmO0Rp iY+AsyDr8mzvqE2j540+gcd1XGzHW2QWVDDYQmXPfDTFPnVKneVQ3+xEX8NJFCl05ids orIj+gR20CBFbfQdNdJJSWENI9prAw2qG1xR1ywo8HLOOLgSlk1gRG2bAwhLhqYSjkvo npAk4rf02mRXNQAIm5UOB+gRFmLFPmpO+8aEDFH6BWc46b4XnQRIrjREnitC/ZI1v6fk XtRg== X-Forwarded-Encrypted: i=1; AKwUvBwqR7hGwufMeg19Ai9uIougfinigBM9FIJaNS/Tp+qJMvgRa8H1Kw4+CMcfqqMz8ZJ7GGahW1O2up8T/j8=@vger.kernel.org X-Gm-Message-State: AFuF++k355QxOhl71LEcRNKAm8Y8WNyps1dMl5YKvVi8J44eJHVFyFS6 mrMVj03w6JRDUTBw+pxXx7iBqJ6iR3vxISDC/fpOyNyZBtfyU71JHFza X-Gm-Gg: AYBFou0k43Br9tTmc4s5bvoSFHLT061skxCu/xhQc17DnLGHDEd2zDKZrhrvlBXUj61 vcP3xCaA3y/POQ9GDYa5zz8aWibLRsktUE3SRv8sWxgL3Ac7Svcg1xoD9dtLX0Ek4QNefbz2WqK CuCqn5UdSknes2NqJCOtWGyFhyWccBVV93vjveXKGYuYTVd5nm0jaWy/AL8zjNoswBM+YxqFt4+ ZEWFG8kLVQ04v0Ghsqx4Zxthz3futoy+iO0hkJJ6YsQ+JQCI+R7Kyk4UDo+Ux9Jnsdtvr/u2pva oPqxd5GH8gymdX07NX7IWB4e68mxKZ0EQqF68K4qIG1rEpembpBAbmd5yD0PS+RHwpGN/ry8lkL v7s41eRJfNpBavaTieHjchKHtFxTkypN+oyj3ICwRejyNpTDzrMWqv754NKE7m/zDPKGM8wxSsf pPl4ZLlfbug8xOBFyIFa9aZd0rMUKEYDsSnoOga8PbObiA+xm2gCZZlwFFlovcKVk= X-Received: by 2002:a05:6000:186a:b0:485:8fe2:eda1 with SMTP id ffacd0b85a97d-4858fe2eedcmr17410130f8f.17.1788813252893; Mon, 07 Sep 2026 13:34:12 -0700 (PDT) Received: from antoniarch ([78.212.37.227]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-4858e239862sm25959116f8f.9.2026.09.07.13.34.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Sep 2026 13:34:12 -0700 (PDT) From: Antoni Pokusinski To: alexandre.belloni@bootlin.com, robh@kernel.org, krzk+dt@kernel.org, conor+dt@kernel.org Cc: linux-rtc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Antoni Pokusinski Subject: [PATCH v6 7/9] rtc: abx80x: replace read-modify-write pattern with regmap helpers Date: Mon, 7 Sep 2026 22:32:14 +0200 Message-ID: <20260907203216.53192-8-apokusinski01@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260907203216.53192-1-apokusinski01@gmail.com> References: <20260907203216.53192-1-apokusinski01@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Before introducing the regmap usage in the driver, updating specific bits of a register was performed using the read-modify-write pattern. Now, the functions regmap_update_bits() and regmap_write_bits() can be used to simplify the code. Signed-off-by: Antoni Pokusinski --- drivers/rtc/rtc-abx80x.c | 134 ++++++++++----------------------------- 1 file changed, 34 insertions(+), 100 deletions(-) diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c index 7b8e6546ccff..b1d8d5a5ddcf 100644 --- a/drivers/rtc/rtc-abx80x.c +++ b/drivers/rtc/rtc-abx80x.c @@ -232,7 +232,6 @@ static int abx80x_rtc_set_time(struct device *dev, struct rtc_time *tm) { struct abx80x_priv *priv = dev_get_drvdata(dev); unsigned char buf[8]; - unsigned int flags; int err; if (tm->tm_year < 100) @@ -257,18 +256,11 @@ static int abx80x_rtc_set_time(struct device *dev, struct rtc_time *tm) } /* Clear the OF bit of Oscillator Status Register */ - err = regmap_read(priv->regmap, ABX8XX_REG_OSS, &flags); + err = regmap_update_bits(priv->regmap, ABX8XX_REG_OSS, ABX8XX_OSS_OF, 0); if (err < 0) - return err; - - err = regmap_write(priv->regmap, ABX8XX_REG_OSS, - flags & ~ABX8XX_OSS_OF); - if (err < 0) { dev_err(dev, "Unable to write oscillator status register\n"); - return err; - } - return 0; + return err; } static irqreturn_t abx80x_handle_irq(int irq, void *dev_id) @@ -380,7 +372,6 @@ static int abx80x_rtc_set_autocalibration(struct device *dev, { struct abx80x_priv *priv = dev_get_drvdata(dev); unsigned int flags = 0; - int retval; if ((autocalibration != 0) && (autocalibration != 1024) && (autocalibration != 512)) { @@ -388,12 +379,6 @@ static int abx80x_rtc_set_autocalibration(struct device *dev, return -EINVAL; } - guard(mutex)(&priv->lock); - - retval = regmap_read(priv->regmap, ABX8XX_REG_OSC, &flags); - if (retval < 0) - return retval; - if (autocalibration == 0) { flags &= ~(ABX8XX_OSC_ACAL_512 | ABX8XX_OSC_ACAL_1024); } else if (autocalibration == 1024) { @@ -405,13 +390,15 @@ static int abx80x_rtc_set_autocalibration(struct device *dev, flags |= (ABX8XX_OSC_ACAL_1024 | ABX8XX_OSC_ACAL_512); } + guard(mutex)(&priv->lock); + /* Unlock write access to Oscillator Control Register */ if (abx80x_write_config_key(dev, ABX8XX_CFG_KEY_OSC) < 0) return -EIO; - retval = regmap_write(priv->regmap, ABX8XX_REG_OSC, flags); - - return retval; + return regmap_write_bits(priv->regmap, ABX8XX_REG_OSC, + ABX8XX_OSC_ACAL_1024 | ABX8XX_OSC_ACAL_512, + flags); } static int abx80x_rtc_get_autocalibration(struct device *dev) @@ -475,7 +462,6 @@ static ssize_t oscillator_store(struct device *dev, { struct abx80x_priv *priv = dev_get_drvdata(dev->parent); int retval, rc_mode = 0; - unsigned int flags; if (strncmp(buf, "rc", 2) == 0) { rc_mode = 1; @@ -488,24 +474,14 @@ static ssize_t oscillator_store(struct device *dev, guard(mutex)(&priv->lock); - retval = regmap_read(priv->regmap, ABX8XX_REG_OSC, &flags); - if (retval < 0) - return retval; - - if (rc_mode == 0) - flags &= ~(ABX8XX_OSC_OSEL); - else - flags |= (ABX8XX_OSC_OSEL); - /* Unlock write access on Oscillator Control register */ if (abx80x_write_config_key(dev->parent, ABX8XX_CFG_KEY_OSC) < 0) return -EIO; - retval = regmap_write(priv->regmap, ABX8XX_REG_OSC, flags); - if (retval < 0) { + retval = regmap_write_bits(priv->regmap, ABX8XX_REG_OSC, ABX8XX_OSC_OSEL, + rc_mode == 0 ? 0 : (ABX8XX_OSC_OSEL)); + if (retval < 0) dev_err(dev, "Failed to write Oscillator Control register\n"); - return retval; - } return retval ? retval : count; } @@ -575,18 +551,11 @@ static int abx80x_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) case RTC_VL_CLR: scoped_guard(mutex, &priv->lock) { - err = regmap_read(priv->regmap, ABX8XX_REG_STATUS, &status); - if (err < 0) - return err; - - status &= ~ABX8XX_STATUS_BLF; - - err = regmap_write(priv->regmap, ABX8XX_REG_STATUS, status); - if (err < 0) - return err; + err = regmap_update_bits(priv->regmap, ABX8XX_REG_STATUS, + ABX8XX_STATUS_BLF, 0); } - return 0; + return err; default: return -ENOIOCTLCMD; @@ -843,7 +812,6 @@ static int abx80x_probe(struct i2c_client *client) struct device_node *np = client->dev.of_node; struct abx80x_priv *priv; int i, err, trickle_cfg = -EINVAL; - unsigned int data; char buf[7]; unsigned int part = (uintptr_t)i2c_get_match_data(client); unsigned int partnumber; @@ -893,14 +861,9 @@ static int abx80x_probe(struct i2c_client *client) dev_info(&client->dev, "model %04x, revision %u.%u, lot %x, wafer %x, uid %x\n", partnumber, majrev, minrev, lot, wafer, uid); - err = regmap_read(regmap, ABX8XX_REG_CTRL1, &data); - if (err < 0) { - dev_err(&client->dev, "Unable to read control register\n"); - return -EIO; - } - - err = regmap_write(regmap, ABX8XX_REG_CTRL1, - (data & ~(ABX8XX_CTRL_12_24 | ABX8XX_CTRL_ARST)) | ABX8XX_CTRL_WRITE); + err = regmap_update_bits(regmap, ABX8XX_REG_CTRL1, + ABX8XX_CTRL_12_24 | ABX8XX_CTRL_ARST | ABX8XX_CTRL_WRITE, + ABX8XX_CTRL_WRITE); if (err < 0) { dev_err(&client->dev, "Unable to write control register\n"); return -EIO; @@ -914,30 +877,10 @@ static int abx80x_probe(struct i2c_client *client) * register is set. RV-1805-C3 datasheet indicates that * the bit should be cleared in section 11h - Control2. */ - err = regmap_read(regmap, ABX8XX_REG_CTRL2, &data); - if (err < 0) { - dev_err(&client->dev, - "Unable to read control2 register\n"); - return -EIO; - } - - err = regmap_write(regmap, ABX8XX_REG_CTRL2, - data & ~ABX8XX_CTRL2_RSVD); - if (err < 0) { - dev_err(&client->dev, - "Unable to write control2 register\n"); - return -EIO; - } - - /* - * Avoid extra power leakage. The RV1805 uses smaller - * 10pin package and the EXTI input is not present. - * Disable it to avoid leakage. - */ - err = regmap_read(regmap, ABX8XX_REG_OUT_CTRL, &data); + err = regmap_update_bits(regmap, ABX8XX_REG_CTRL2, + ABX8XX_CTRL2_RSVD, 0); if (err < 0) { - dev_err(&client->dev, - "Unable to read output control register\n"); + dev_err(&client->dev, "Unable to write control2 register\n"); return -EIO; } @@ -948,8 +891,14 @@ static int abx80x_probe(struct i2c_client *client) if (abx80x_write_config_key(&client->dev, ABX8XX_CFG_KEY_MISC) < 0) return -EIO; - err = regmap_write(regmap, ABX8XX_REG_OUT_CTRL, - data | ABX8XX_OUT_CTRL_EXDS); + /* + * Avoid extra power leakage. The RV1805 uses smaller + * 10pin package and the EXTI input is not present. + * Disable it to avoid leakage. + */ + err = regmap_write_bits(regmap, ABX8XX_REG_OUT_CTRL, + ABX8XX_OUT_CTRL_EXDS, + ABX8XX_OUT_CTRL_EXDS); if (err < 0) { dev_err(&client->dev, "Unable to write output control register\n"); @@ -1000,25 +949,11 @@ static int abx80x_probe(struct i2c_client *client) return err; /* Disable unused interrupts */ - err = regmap_read(regmap, ABX8XX_REG_IRQ, &data); - if (err < 0) { - dev_err(&client->dev, "Unable to read irq register\n"); - return -EIO; - } - - err = regmap_write(regmap, ABX8XX_REG_IRQ, - data & ~(ABX8XX_IRQ_EX1E | - ABX8XX_IRQ_EX2E | - ABX8XX_IRQ_TIE | - ABX8XX_IRQ_BLIE)); - if (err < 0) { - dev_err(&client->dev, "Unable to write irq register\n"); - return -EIO; - } - - err = regmap_read(regmap, ABX8XX_REG_OSC, &data); + err = regmap_update_bits(regmap, ABX8XX_REG_IRQ, + ABX8XX_IRQ_EX1E | ABX8XX_IRQ_EX2E | + ABX8XX_IRQ_TIE | ABX8XX_IRQ_BLIE, 0); if (err < 0) { - dev_err(&client->dev, "Unable to read Oscillator Control register\n"); + dev_err(&client->dev, "Unable to update irq register\n"); return -EIO; } @@ -1026,11 +961,10 @@ static int abx80x_probe(struct i2c_client *client) if (abx80x_write_config_key(client, ABX8XX_CFG_KEY_OSC) < 0) return -EIO; - err = regmap_write(regmap, ABX8XX_REG_OSC, - data & ~(ABX8XX_OSC_ACIE | - ABX8XX_OSC_OFIE)); + err = regmap_write_bits(regmap, ABX8XX_REG_OSC, + ABX8XX_OSC_ACIE | ABX8XX_OSC_OFIE, 0); if (err < 0) { - dev_err(&client->dev, "Unable to write Oscillator Control register\n"); + dev_err(&client->dev, "Unable to update Oscillator Control register\n"); return -EIO; } -- 2.55.0