From ea0e1e30945df9ab9423ed1f95dd32d95803a07c Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Mon, 19 Oct 2026 23:18:14 +0200 Subject: [PATCH] rtc: nct6694: use guard Use guard() to simplify locking Link: https://patch.msgid.link/20261019211827.126262-13-alexandre.belloni@bootlin.com Signed-off-by: Alexandre Belloni --- drivers/rtc/rtc-nct6694.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/rtc/rtc-nct6694.c b/drivers/rtc/rtc-nct6694.c index 35401a0d9cf5..1cf9b672256a 100644 --- a/drivers/rtc/rtc-nct6694.c +++ b/drivers/rtc/rtc-nct6694.c @@ -210,20 +210,16 @@ static irqreturn_t nct6694_irq(int irq, void *dev_id) }; int ret; - rtc_lock(data->rtc); + guard(rtc_ops)(data->rtc); sts->irq_en = NCT6694_RTC_IRQ_EN; sts->irq_pend = NCT6694_RTC_IRQ_STS; ret = nct6694_write_msg(data->nct6694, &cmd_hd, sts); - if (ret) { - rtc_unlock(data->rtc); + if (ret) return IRQ_NONE; - } rtc_update_irq(data->rtc, 1, RTC_IRQF | RTC_AF); - rtc_unlock(data->rtc); - return IRQ_HANDLED; }