[PATCH v2 3/4] ASoC: SDCA: Tidy up irq_enable_flags()/sdca_irq_disable()

Charles Keepax
2026-04-09T16:44:05Z

In irq_enable_flags() and sdca_irq_disable() there is a NULL
check on the interrupt data pointer, however this is just pulled
from an array so can never be NULL. This was likely left over
from an earlier version that looked up the data in a different
way. Replace the check with checking for the IRQ itself being
non-zero.

Whilst here also drop the sdca_interrupt structure down into
the loop within the function to better match the style of the
rest of the code in this file.

Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---

No changes since v1.

sound/soc/sdca/sdca_interrupts.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/sound/soc/sdca/sdca_interrupts.c b/sound/soc/sdca/sdca_interrupts.c
index 475aebcafe3f1..3d7eb19967243 100644
--- a/sound/soc/sdca/sdca_interrupts.c
+++ b/sound/soc/sdca/sdca_interrupts.c
@@ -630,13 +630,12 @@ EXPORT_SYMBOL_NS_GPL(sdca_irq_allocate, "SND_SOC_SDCA");
static void irq_enable_flags(struct sdca_function_data *function,
struct sdca_interrupt_info *info, bool early)
{
- struct sdca_interrupt *interrupt;
int i;

for (i = 0; i < SDCA_MAX_INTERRUPTS; i++) {
- interrupt = &info->irqs[i];
+ struct sdca_interrupt *interrupt = &info->irqs[i];

- if (!interrupt || interrupt->function != function)
+ if (!interrupt->irq || interrupt->function != function)
continue;

switch (SDCA_CTL_TYPE(interrupt->entity->type,
@@ -689,13 +688,12 @@ EXPORT_SYMBOL_NS_GPL(sdca_irq_enable, "SND_SOC_SDCA");
void sdca_irq_disable(struct sdca_function_data *function,
struct sdca_interrupt_info *info)
{
- struct sdca_interrupt *interrupt;
int i;

for (i = 0; i < SDCA_MAX_INTERRUPTS; i++) {
- interrupt = &info->irqs[i];
+ struct sdca_interrupt *interrupt = &info->irqs[i];

- if (!interrupt || interrupt->function != function)
+ if (!interrupt->irq || interrupt->function != function)
continue;

disable_irq(interrupt->irq);
--
2.47.3