]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
mfd: ezx-pcap: Avoid rescheduling after destroying workqueue
authorKrzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Thu, 5 Mar 2026 21:45:48 +0000 (22:45 +0100)
committerLee Jones <lee@kernel.org>
Wed, 25 Mar 2026 12:45:59 +0000 (12:45 +0000)
Driver allocates workqueue and then registers additional interrupt
handler with devm interface.  This means that device removal will not
use a reversed order, but first destroy workqueue and then, via devm
release handlers, free the interrupt.

The interrupt handler registered with devm does not directly
use/schedule work items on the workqueue and the remove() function
correctly removes other IRQs handlers, however the code mixing devm and
non-devm interfaces is difficult to analyze and read.

Make the code flow much more obvious by using devm interface for
allocating the workqueue, so it will be freed with the rest of devm
resources.

Change is not equivalent in the workqueue itself: use non-legacy API
which does not set (__WQ_LEGACY | WQ_MEM_RECLAIM).  The workqueue is
used to update device registers, thus there is no point to run it for
memory reclaim.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://patch.msgid.link/20260305-workqueue-devm-v2-9-66a38741c652@oss.qualcomm.com
Signed-off-by: Lee Jones <lee@kernel.org>
drivers/mfd/ezx-pcap.c

index 8e51c113a320519674f5791ed9ad88eaa32c8376..9a685ff8cd1572985719bf36e362515388442ccb 100644 (file)
@@ -375,8 +375,6 @@ static void ezx_pcap_remove(struct spi_device *spi)
        /* cleanup irqchip */
        for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++)
                irq_set_chip_and_handler(i, NULL, NULL);
-
-       destroy_workqueue(pcap->workqueue);
 }
 
 static int ezx_pcap_probe(struct spi_device *spi)
@@ -411,7 +409,7 @@ static int ezx_pcap_probe(struct spi_device *spi)
 
        /* setup irq */
        pcap->irq_base = pdata->irq_base;
-       pcap->workqueue = create_singlethread_workqueue("pcapd");
+       pcap->workqueue = devm_alloc_ordered_workqueue(&spi->dev, "pcapd", 0);
        if (!pcap->workqueue)
                return -ENOMEM;
 
@@ -463,9 +461,7 @@ remove_subdevs:
 free_irqchip:
        for (i = pcap->irq_base; i < (pcap->irq_base + PCAP_NIRQS); i++)
                irq_set_chip_and_handler(i, NULL, NULL);
-/* destroy_workqueue: */
-       destroy_workqueue(pcap->workqueue);
-ret:
+
        return ret;
 }