[PATCH v10 05/13] mfd: nct6694: Drop the unused IRQ enable mask

From: a0282524688

Date: Wed Nov 18 2026 - 03:18:02 EST


From: Ming Yu <a0282524688@xxxxxxxxx>

The .irq_enable and .irq_disable callbacks only update the irq_enable
bitmask under irq_lock, which is a spinlock_t. Nothing ever reads that
bitmask, so the callbacks do not mask anything. They also take irq_lock
while the IRQ core holds desc->lock, a raw spinlock. On PREEMPT_RT this
is an invalid wait context.

Remove both callbacks, along with irq_enable and irq_lock, and keep
IRQCHIP_SKIP_SET_WAKE. Without .irq_disable, the IRQ core falls back to
lazy disable, and handle_simple_irq() keeps a disabled interrupt pending
instead of calling its handler. The behaviour is therefore unchanged.

Fixes: 51dad33ede63 ("mfd: Add core driver for Nuvoton NCT6694")
Signed-off-by: Ming Yu <a0282524688@xxxxxxxxx>
---
Changes in v10:
- New patch. Drop the .irq_enable/.irq_disable callbacks, which only
update a bitmask that is never read and take a spinlock_t while the
IRQ core holds the raw desc->lock (reported by Sashiko on v9 06/12
and 09/12).

drivers/mfd/nct6694.c | 25 -------------------------
include/linux/mfd/nct6694.h | 2 --
2 files changed, 27 deletions(-)

diff --git a/drivers/mfd/nct6694.c b/drivers/mfd/nct6694.c
index 6b8b951f0166..27e9effd68a7 100644
--- a/drivers/mfd/nct6694.c
+++ b/drivers/mfd/nct6694.c
@@ -19,7 +19,6 @@
#include <linux/mfd/nct6694.h>
#include <linux/module.h>
#include <linux/slab.h>
-#include <linux/spinlock.h>
#include <linux/usb.h>

static const struct mfd_cell nct6694_devs[] = {
@@ -250,31 +249,9 @@ static void usb_int_callback(struct urb *urb)
dev_warn(nct6694->dev, "Failed to resubmit urb, status %pe", ERR_PTR(ret));
}

-static void nct6694_irq_enable(struct irq_data *data)
-{
- struct nct6694 *nct6694 = irq_data_get_irq_chip_data(data);
- irq_hw_number_t hwirq = irqd_to_hwirq(data);
-
- guard(spinlock_irqsave)(&nct6694->irq_lock);
-
- nct6694->irq_enable |= BIT(hwirq);
-}
-
-static void nct6694_irq_disable(struct irq_data *data)
-{
- struct nct6694 *nct6694 = irq_data_get_irq_chip_data(data);
- irq_hw_number_t hwirq = irqd_to_hwirq(data);
-
- guard(spinlock_irqsave)(&nct6694->irq_lock);
-
- nct6694->irq_enable &= ~BIT(hwirq);
-}
-
static const struct irq_chip nct6694_irq_chip = {
.name = "nct6694-irq",
.flags = IRQCHIP_SKIP_SET_WAKE,
- .irq_enable = nct6694_irq_enable,
- .irq_disable = nct6694_irq_disable,
};

static int nct6694_irq_domain_map(struct irq_domain *d, unsigned int irq, irq_hw_number_t hw)
@@ -356,8 +333,6 @@ static int nct6694_usb_probe(struct usb_interface *iface,
ida_init(&nct6694->canfd_ida);
ida_init(&nct6694->wdt_ida);

- spin_lock_init(&nct6694->irq_lock);
-
ret = devm_mutex_init(dev, &nct6694->access_lock);
if (ret)
goto err_ida;
diff --git a/include/linux/mfd/nct6694.h b/include/linux/mfd/nct6694.h
index 69e4652cf16c..2022b8fcc096 100644
--- a/include/linux/mfd/nct6694.h
+++ b/include/linux/mfd/nct6694.h
@@ -91,13 +91,11 @@ struct nct6694 {
struct ida wdt_ida;
struct irq_domain *domain;
struct mutex access_lock;
- spinlock_t irq_lock;
struct urb *int_in_urb;
struct usb_device *udev;
union nct6694_usb_msg *usb_msg;
void *data_buf;
__le32 *int_buffer;
- unsigned int irq_enable;
};

int nct6694_read_msg(struct nct6694 *nct6694, const struct nct6694_cmd_header *cmd_hd, void *buf);
--
2.34.1