From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 97733479883 for ; Tue, 11 Aug 2026 19:42:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786477353; cv=none; b=Cn4dciQKH1oR7cOAgncot3JueyilPIRsL7+lX3dV+nKNKdqcJ0qx0W0XtS0zo1pq6yzx8YFX49QhHjB/37xCvdMO93UXfT+JR+FfdHOoqwaFFgAWqjBwGJNWaWrVDUI9hsh50unPA7+oHcCFJBc4OMHM6O0nn9nViYr4bY7xCnE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786477353; c=relaxed/simple; bh=7zftsifT1TeOCwtPU5cqKvqhs764DJUWLd8kYg26RIk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nrr+xcOK/VyXIc2X4u0Fk1MAovUfpquYHR9bKqRmyA5+TS6QXySgKa2RL2aPoGV2+rRrpsTGVjjynEjuPet9hHNqYqHo7Fao+ZG4HnwTswhGjgyV4UQ0D+TpSMDBafPCM7krQZNwuRthf5b1i0o9JvPpVe4zK5mWw8FLnWIZV1s= 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=C4mnptJc; arc=none smtp.client-ip=209.85.128.45 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="C4mnptJc" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4980dc26022so1740145e9.1 for ; Tue, 11 Aug 2026 12:42:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786477348; x=1787082148; 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=Km3JbJM3tHI5y78m8g9L0NcliILGFksyyeAC4KOBDJY=; b=C4mnptJct4IlgE3gUwy91DHCBPT31w/3u8NPEEFdtPHa8c46azdtMdMYjkQYptmQtL /2ocncWYkPewsg26XtDdX4v4fXJCXcWOCLzcB3rOY1+cEdC+jsZg7T/Rgr8vREGjEQgn Idchy5xOVdquyJATS1/M25efpfG+Ar8vG7uc5GxbGZRQVCA53knfu9nGoi3XB6MbLqfk PVjxC/NVJFyUZEpKnX7xF59o5psoJGp90pu/UVOTyidvkMSfO3OP++A4lk9yJy9oi0ay hufrXThK/One3Uu3GJkOEh33qWLYV/Ke2VYmLL4KAqKsqMDuxYoEMRgc/6ZJE8gheH1T DdgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786477348; x=1787082148; 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=Km3JbJM3tHI5y78m8g9L0NcliILGFksyyeAC4KOBDJY=; b=n4/M0PVlHVGG+qw1lvEv0qsOE5jDd1zDeP7L6MtU87xB9v2BYU+3PDkHnxp8wtChbS Acpo+9fnKeve3c1+QbvbTl6gnQ7prGtcucxoaFc8G7Xo9lGWjeXe9Eo19a80lU8YOCA3 /3hqW/yDBYXUwIzLcvgsTyWiayvwy9p7CsIx3ghURXQZfQnGHxBRZIwz4la4sPGoJV01 jko3/NAM5UMR71mcB9e7ebO6s7t5D+jV8pS930xgrWhYRQZd/kYSkoqXUgHn0H5DKMp/ VjMOz8Gjgcjv1DFsRKHXQbrK4pfEbKFSTGiGjyxXTvShnmR7zUqHi/DJiJDYccy9cl/a Dh5A== X-Gm-Message-State: AOJu0YxBWc3z1j7FM4rZJOoqYCDeFEj0c2ZrRSSLc0Y8ozgVzObyiC12 8kfXVaRgwPOX2x3yRJladvyrItx4o6ApzxKkA2hYxsfmrJnrsJtumRQz X-Gm-Gg: AR+sD10Vs9FFcYMIVRvl5hdBEnJDYOh5eF73u8SJYwpYHvHzl3lXcY79IYinOELKjSw QZqxu9biM1MKla24T+Kt7tKJIEpqERsMpNIySdlghXFkgZXKBcW9hQTNLLpPUy6miMK0IVnTf0s Oi7q9x2OM0mgkgB5Am3sdqLnp9qEeZBQZcMRA0renEV4ZCtUrEmEi0WUVPZ+pR2K9C2ncpLIeKD ij4oJgWBsyvd5gm+WMykEj04BgMOG5nKn7Ky3NG3b2czqzf6aUAmvuQkREtyxkVFgSY2+ZD1t4+ 4NNuvXigqHkDGQ7mQZvtNWhuazgTEffGYa8aGMejkGOvQIE1DvE2m+egbkkkm3C9uKqoBfqUMwy Wil2pRYJ/NwnJA0DSF8yLj194dDmNpzB1hHtiFXBE91ZdvfqWFImZoMqvFnIKS+cGXy8iV1Pkfg /oICFX6gwyakd1mZQJkuq0wnEWcLIg3ZRB3j4rzReXDFScfwZku8c5SYUzMvsNJzqZ X-Received: by 2002:a05:600c:1d02:b0:496:b3a0:1cfe with SMTP id 5b1f17b1804b1-4997845f3femr88998265e9.12.1786477347680; Tue, 11 Aug 2026 12:42:27 -0700 (PDT) Received: from antoniarch ([78.213.143.159]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4997b22784fsm2606535e9.2.2026.08.11.12.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Aug 2026 12:42:27 -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 v5 7/9] rtc: abx80x: replace read-modify-write pattern with regmap helpers Date: Tue, 11 Aug 2026 21:40:32 +0200 Message-ID: <20260811194034.28937-8-apokusinski01@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260811194034.28937-1-apokusinski01@gmail.com> References: <20260811194034.28937-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 | 135 ++++++++++----------------------------- 1 file changed, 35 insertions(+), 100 deletions(-) diff --git a/drivers/rtc/rtc-abx80x.c b/drivers/rtc/rtc-abx80x.c index 5d41882f3c70..ab88af43b4fa 100644 --- a/drivers/rtc/rtc-abx80x.c +++ b/drivers/rtc/rtc-abx80x.c @@ -232,7 +232,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; @@ -256,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) @@ -378,7 +371,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)) { @@ -386,12 +378,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) { @@ -403,13 +389,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) @@ -473,7 +461,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; @@ -486,24 +473,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; } @@ -573,18 +550,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; @@ -841,7 +811,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; @@ -891,14 +860,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; @@ -912,30 +876,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; } @@ -946,8 +890,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"); @@ -998,33 +948,18 @@ 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; } - err = regmap_write(regmap, ABX8XX_REG_OSC, - data & ~(ABX8XX_OSC_ACIE | - ABX8XX_OSC_OFIE)); + err = regmap_update_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