ASoC: SDCA: Update externally_requested flag to cover all requests

Currently there is a flag to indicate if an IRQ has been requested by
something outside the SDCA core, such that the core can skip requesting
that IRQ. However, it is simpler and more useful to always store the
allocated IRQ number. This will allow the core to see if the IRQ has
been requested, to perform additional operations on the IRQ, and
request IRQs in multiple phases.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Link: https://patch.msgid.link/20251020155512.353774-7-ckeepax@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/sdca_interrupts.h b/include/sound/sdca_interrupts.h
index d652c6e94ddcb499bcb86b1e709226b63ae44c20..e4bf123936bbd430e28dd8ded42394ad948fe4df 100644 (file)
--- a/include/sound/sdca_interrupts.h
+++ b/include/sound/sdca_interrupts.h
@@ -29,9 +29,8 @@ struct sdca_function_data;
  * @entity: Pointer to the Entity that the interrupt is associated with.
  * @control: Pointer to the Control that the interrupt is associated with.
  * @priv: Pointer to private data for use by the handler.
- * @externally_requested: Internal flag used to check if a client driver has
- * already requested the interrupt, for custom handling, allowing the core to
- * skip handling this interrupt.
+ * @irq: IRQ number allocated to this interrupt, also used internally to track
+ * the IRQ being assigned.
  */
 struct sdca_interrupt {
        const char *name;
@@ -44,7 +43,7 @@ struct sdca_interrupt {
 
        void *priv;
 
-       bool externally_requested;
+       int irq;
 };
 
 /**

diff --git a/sound/soc/sdca/sdca_interrupts.c b/sound/soc/sdca/sdca_interrupts.c
index 898069ceffe93e97c041acfc3c30c76a0a0ec9d8..cb7c7a6f356ed8cc22dd558981ccbaa03732631d 100644 (file)
--- a/sound/soc/sdca/sdca_interrupts.c
+++ b/sound/soc/sdca/sdca_interrupts.c
@@ -262,6 +262,8 @@ static int sdca_irq_request_locked(struct device *dev,
        if (ret)
                return ret;
 
+       info->irqs[sdca_irq].irq = irq;
+
        dev_dbg(dev, "requested irq %d for %s\n", irq, name);
 
        return 0;
@@ -301,8 +303,6 @@ int sdca_irq_request(struct device *dev, struct sdca_interrupt_info *info,
                return ret;
        }
 
-       info->irqs[sdca_irq].externally_requested = true;
-
        return 0;
 }
 EXPORT_SYMBOL_NS_GPL(sdca_irq_request, "SND_SOC_SDCA");
@@ -379,9 +379,9 @@ int sdca_irq_populate(struct sdca_function_data *function,
 
                        interrupt = &info->irqs[irq];
 
-                       if (interrupt->externally_requested) {
+                       if (interrupt->requested) {
                                dev_dbg(dev,
-                                       "skipping irq %d, externally requested\n",
+                                       "skipping irq %d, already requested\n",
                                        irq);
                                continue;
                        }