diff mbox series

[2/2] rtc: max31335: use regmap_update_bits_check

Message ID 20240115232215.273374-2-alexandre.belloni@bootlin.com
State Accepted
Headers show
Series [1/2] rtc: max31335: remove unecessary locking | expand

Commit Message

Alexandre Belloni Jan. 15, 2024, 11:22 p.m. UTC 
From: Alexandre Belloni <alexandre.belloni@bootlin.com>

Simplify the IRQ handler by using regmap_update_bits_check.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
 drivers/rtc/rtc-max31335.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Comments

Antoniu Miclaus Jan. 16, 2024, 10:48 a.m. UTC | #1 
> From: Alexandre Belloni <alexandre.belloni@bootlin.com>
> 
> Simplify the IRQ handler by using regmap_update_bits_check.
> 
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: Antoniu Miclaus <antoniu.miclaus@analog.com>
> ---
>  drivers/rtc/rtc-max31335.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/rtc/rtc-max31335.c b/drivers/rtc/rtc-max31335.c
> index 2ce23f60a7f3..a38d303d9df4 100644
> --- a/drivers/rtc/rtc-max31335.c
> +++ b/drivers/rtc/rtc-max31335.c
> @@ -348,18 +348,16 @@ static int max31335_alarm_irq_enable(struct device
> *dev, unsigned int enabled)
>  static irqreturn_t max31335_handle_irq(int irq, void *dev_id)
>  {
>  	struct max31335_data *max31335 = dev_id;
> -	int ret, status;
> +	bool status;
> +	int ret;
> 
> -	ret = regmap_read(max31335->regmap, MAX31335_STATUS1,
> &status);
> +	ret = regmap_update_bits_check(max31335->regmap,
> MAX31335_STATUS1,
> +				       MAX31335_STATUS1_A1F, 0, &status);
>  	if (ret)
>  		return IRQ_HANDLED;
> 
> -	if (FIELD_GET(MAX31335_STATUS1_A1F, status)) {
> -		regmap_update_bits(max31335->regmap,
> MAX31335_STATUS1,
> -				   MAX31335_STATUS1_A1F, 0);
> -
> +	if (status)
>  		rtc_update_irq(max31335->rtc, 1, RTC_AF | RTC_IRQF);
> -	}
> 
>  	return IRQ_HANDLED;
>  }
> --
> 2.43.0
diff mbox series

Patch

diff --git a/drivers/rtc/rtc-max31335.c b/drivers/rtc/rtc-max31335.c
index 2ce23f60a7f3..a38d303d9df4 100644
--- a/drivers/rtc/rtc-max31335.c
+++ b/drivers/rtc/rtc-max31335.c
@@ -348,18 +348,16 @@  static int max31335_alarm_irq_enable(struct device *dev, unsigned int enabled)
 static irqreturn_t max31335_handle_irq(int irq, void *dev_id)
 {
 	struct max31335_data *max31335 = dev_id;
-	int ret, status;
+	bool status;
+	int ret;
 
-	ret = regmap_read(max31335->regmap, MAX31335_STATUS1, &status);
+	ret = regmap_update_bits_check(max31335->regmap, MAX31335_STATUS1,
+				       MAX31335_STATUS1_A1F, 0, &status);
 	if (ret)
 		return IRQ_HANDLED;
 
-	if (FIELD_GET(MAX31335_STATUS1_A1F, status)) {
-		regmap_update_bits(max31335->regmap, MAX31335_STATUS1,
-				   MAX31335_STATUS1_A1F, 0);
-
+	if (status)
 		rtc_update_irq(max31335->rtc, 1, RTC_AF | RTC_IRQF);
-	}
 
 	return IRQ_HANDLED;
 }