From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 4C49840DB42 for ; Wed, 22 Jul 2026 20:00:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784750455; cv=none; b=VSuQDM8LPcpF4YGj0v3kGtIbfsyuH33W821Ny5+59Ig50K3QQ0UEFoWXZ2Uz8M7omkZWiOzN3tE5DwbjOTIWKkdwE2TE6ZfG4f/FhmqbO2ARNz0AjziIC8rZWEq5gDjthMgg51NKm7Q+sY7N3BDkOLLSiat5HTorA53pjkPfQk8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784750455; c=relaxed/simple; bh=qMJGANLLeJN5aJYGLw3k+K4atK9jwtSuuysXt9++2WU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jZPhww5xBrkpDHLyUEe/SP+AMKBsOGDXpMfFa5VC5GA21JNtyxWgLZrxf3PMovRqUis68O74YQ38FqIZBpM++GlO7+KlkuQtdreaNmE6Y6S0qWYzG45ZmXmQf+K0LzE+8YT4mZ8CrCZjb5x3xXbNPaL7nFjFflCIM/EYUI2l7Rg= 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=GtKiIsoS; arc=none smtp.client-ip=209.85.221.41 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="GtKiIsoS" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-476a130c138so9454002f8f.0 for ; Wed, 22 Jul 2026 13:00:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784750450; x=1785355250; 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=OTMGum6yp7PCDuuQ58Six53iQI5SthybixPx4tQNUyI=; b=GtKiIsoSwQU4V7vvJ3Uv238aAEHPaZpT9FoY9Obif9nBkLrQ6RrvxYzEqNechKzqYo JIJmthMh6BI/enf+uGcSmrrsRsUrNWJ7rar7dbpCPw2cj7/0/aWkWziDMwsSOuiAcVj7 OPp+8CbjWii+TF8F1yWJowvkN17d8Kr+XiACRcYVsKzRR2E6UMkUlSABvfiVeDnmcnR+ MXxvbIM4raqkvuBYosQ2djcUQ1HeVXBEmR430EPFUyDi5M12jXdhz8/p0iBY4cK/JQou CqPhsRcx/HsU5wahe/LboAi8zEVSUtbTWiEeJ6QD1SRZPn6BLx3mAtmnN6pDRW4w/B90 reig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784750450; x=1785355250; 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=OTMGum6yp7PCDuuQ58Six53iQI5SthybixPx4tQNUyI=; b=NkJpkgeS2ClpLQ0gsd+PmQZEVX0YCZTSw3zbEKwXa3xWgy+Q99IG/acbBAlJD7gWBY A6JO7uot3LH9sp4V7Ka+lWGm0QVlzt3+Wkp/6dcKbgaP9Jw7ciOiw4RSo/JyDGYCafAB jrMJCHVPKxL58y97V52bn8j93ipKSByrLrRmBcssO1/Z6NTKreYkhEAm/k2LV6DkeBHK mS5am8Dhowal+2uwLGGuukl4ble3KfMBZICjLN4zHFrN56n/jc1SS53dfCXMWB5FfE76 aWpf8s1PgX5eVDWWaasbPi48A2FnfL+o+GvHPm5k0o14MtiEEhhounr/1X0ABdpJOlUo ePBg== X-Gm-Message-State: AOJu0YyorVgsK4CRSQqvSEj18Op7fs9G3L9ft7SDwqlpPaHccx1G/yDs ar6cuW0JtKRm5c7Ys5XnvdcZoAmufzy6PaQB1tdVeahrGJi9TQXUQIZ1 X-Gm-Gg: AR+sD13Z803YIcbiyyCUQ21dDF2R9KM/gVtyYc5+WdxjXAZQKCsJuKJj2IPThTgyZgf XoXI7QBvk9/7FQoaWeoWBpvNLpB6SRibvS75zzXJ0amEyCvEc7kWSi2Jivwrk4kqJDoDLrY7FoY oXZ/U9ythiYfOqyL4i5nc8nngthfTjJFpiU8j9GjDaQfXywV3WJ2htpzv/uCJtOyJ1KTwMX33wL tLISfNEP3Re083owSopI7jenr1aKAlsHMsXMoYSFWluIYV40KXv82Kuwuurj7Sh28WudsLucAju Gf+QLjgKvbDq3lpX0DS9VBARnxVj77QDY28MjAPunzC3IEbFjWZRkVcbbdKilnPNWV54EtiyDuW jDhiUIx1ENxR6GKH51t+RyKzX5iIrkZDe42AUmtvWa9U2HWbdbHjEF7fTaIQ3QdA+zEA3XabjZe hWnO00Mw== X-Received: by 2002:a05:6000:18a2:b0:47f:7531:3e6d with SMTP id ffacd0b85a97d-47f8dc8cc77mr289835f8f.38.1784750449660; Wed, 22 Jul 2026 13:00:49 -0700 (PDT) Received: from antoniarch ([78.210.252.218]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-47f85c52fa9sm9532851f8f.20.2026.07.22.13.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Jul 2026 13:00:49 -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, Antoni Pokusinski Subject: [PATCH 4/6] rtc: abx80x: replace read-modify-write pattern with regmap helpers Date: Wed, 22 Jul 2026 21:58:12 +0200 Message-ID: <20260722195814.298552-5-apokusinski01@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260722195814.298552-1-apokusinski01@gmail.com> References: <20260722195814.298552-1-apokusinski01@gmail.com> Precedence: bulk X-Mailing-List: linux-rtc@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 | 105 +++++++++++---------------------------- 1 file changed, 28 insertions(+), 77 deletions(-) diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c index e5ba821a6768..7761cb353994 100644 --- a/drivers/rtc/rtc-abx80x.c +++ b/drivers/rtc/rtc-abx80x.c @@ -222,7 +222,7 @@ 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]; - int err, flags; + int err; if (tm->tm_year < 100) return -EINVAL; @@ -244,18 +244,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) @@ -352,7 +345,7 @@ static int abx80x_rtc_set_autocalibration(struct device *dev, int autocalibration) { struct abx80x_priv *priv = dev_get_drvdata(dev); - int retval, flags = 0; + int flags = 0; if ((autocalibration != 0) && (autocalibration != 1024) && (autocalibration != 512)) { @@ -360,10 +353,6 @@ static int abx80x_rtc_set_autocalibration(struct device *dev, return -EINVAL; } - 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) { @@ -379,9 +368,9 @@ static int abx80x_rtc_set_autocalibration(struct device *dev, 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) @@ -443,7 +432,7 @@ static ssize_t oscillator_store(struct device *dev, const char *buf, size_t count) { struct abx80x_priv *priv = dev_get_drvdata(dev->parent); - int retval, flags, rc_mode = 0; + int retval, rc_mode = 0; if (strncmp(buf, "rc", 2) == 0) { rc_mode = 1; @@ -454,24 +443,14 @@ static ssize_t oscillator_store(struct device *dev, return -EINVAL; } - 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; } @@ -537,17 +516,8 @@ static int abx80x_ioctl(struct device *dev, unsigned int cmd, unsigned long arg) return put_user(tmp, (unsigned int __user *)arg); case RTC_VL_CLR: - 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; - - return 0; + return regmap_update_bits(priv->regmap, ABX8XX_REG_STATUS, + ABX8XX_STATUS_BLF, 0); default: return -ENOIOCTLCMD; @@ -799,7 +769,7 @@ static int abx80x_probe(struct i2c_client *client) struct regmap *regmap; struct device_node *np = client->dev.of_node; struct abx80x_priv *priv; - int i, data, err, trickle_cfg = -EINVAL; + int i, err, trickle_cfg = -EINVAL; char buf[7]; unsigned int part = (uintptr_t)i2c_get_match_data(client); unsigned int partnumber; @@ -846,14 +816,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; @@ -867,30 +832,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; } @@ -901,8 +846,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"); -- 2.55.0