]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
rtc: s5m: replace regmap_update_bits with regmap_clear/set_bits
authorAndré Draszik <andre.draszik@linaro.org>
Wed, 9 Apr 2025 20:37:51 +0000 (21:37 +0100)
committerAlexandre Belloni <alexandre.belloni@bootlin.com>
Mon, 23 Jun 2025 21:58:40 +0000 (23:58 +0200)
The regmap_clear_bits() and regmap_set_bits() helper macros state the
intention a bit more obviously.

Use those.

Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: André Draszik <andre.draszik@linaro.org>
Link: https://lore.kernel.org/r/20250409-s2mpg10-v4-30-d66d5f39b6bf@linaro.org
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
drivers/rtc/rtc-s5m.c

index f4caed953efdd23fd0132d74d5199dec9cdfd294..27115523b8c25794a9f3ac8e734bb1ed998e9518 100644 (file)
@@ -338,8 +338,8 @@ static int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)
 
        /* On S2MPS13 the AUDR is not auto-cleared */
        if (info->device_type == S2MPS13X)
-               regmap_update_bits(info->regmap, info->regs->udr_update,
-                                  S2MPS13_RTC_AUDR_MASK, 0);
+               regmap_clear_bits(info->regmap, info->regs->udr_update,
+                                 S2MPS13_RTC_AUDR_MASK);
 
        return ret;
 }
@@ -351,10 +351,8 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
        int ret;
 
        if (info->regs->read_time_udr_mask) {
-               ret = regmap_update_bits(info->regmap,
-                               info->regs->udr_update,
-                               info->regs->read_time_udr_mask,
-                               info->regs->read_time_udr_mask);
+               ret = regmap_set_bits(info->regmap, info->regs->udr_update,
+                                     info->regs->read_time_udr_mask);
                if (ret) {
                        dev_err(dev,
                                "Failed to prepare registers for time reading: %d\n",