Unverified Commit 0b8757b2 authored by Richard Fitzgerald's avatar Richard Fitzgerald Committed by Mark Brown
Browse files

ASoC: SDCA: Unregister IRQ handlers on module remove 



Ensure that all interrupt handlers are unregistered before the parent
regmap_irq is unregistered.

sdca_irq_cleanup() was only called from the component_remove(). If the
module was loaded and removed without ever being component probed the
FDL interrupts would not be unregistered and this would hit a WARN
when devm called regmap_del_irq_chip() during the removal of the
parent IRQ.

Fixes: 4e531164 ("ASoC: SDCA: Fix errors in IRQ cleanup")
Signed-off-by: default avatarRichard Fitzgerald <rf@opensource.cirrus.com>
Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20260408093835.2881486-5-ckeepax@opensource.cirrus.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 58dec4fa

include/sound/sdca_interrupts.h

+2 −2
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ int sdca_irq_populate_early(struct device *dev, struct regmap *function_regmap, 
int sdca_irq_populate(struct sdca_function_data *function,

		      struct snd_soc_component *component,

		      struct sdca_interrupt_info *info);

void sdca_irq_cleanup(struct sdca_function_data *function,

		      struct snd_soc_component *component,

void sdca_irq_cleanup(struct device *dev,

		      struct sdca_function_data *function,

		      struct sdca_interrupt_info *info);

struct sdca_interrupt_info *sdca_irq_allocate(struct device *dev,

					      struct regmap *regmap, int irq);

sound/soc/sdca/sdca_class_function.c

+9 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static void class_function_component_remove(struct snd_soc_component *component) 
	struct class_function_drv *drv = snd_soc_component_get_drvdata(component);

	struct sdca_class_drv *core = drv->core;



	sdca_irq_cleanup(drv->function, component, core->irq_info);

	sdca_irq_cleanup(component->dev, drv->function, core->irq_info);

}



static int class_function_set_jack(struct snd_soc_component *component,
@@ -411,6 +411,13 @@ static int class_function_probe(struct auxiliary_device *auxdev, 
	return 0;

}



static void class_function_remove(struct auxiliary_device *auxdev)

{

	struct class_function_drv *drv = auxiliary_get_drvdata(auxdev);



	sdca_irq_cleanup(drv->dev, drv->function, drv->core->irq_info);

}



static int class_function_runtime_suspend(struct device *dev)

{

	struct auxiliary_device *auxdev = to_auxiliary_dev(dev);
@@ -559,6 +566,7 @@ static struct auxiliary_driver class_function_drv = { 
	},



	.probe		= class_function_probe,

	.remove		= class_function_remove,

	.id_table	= class_function_id_table

};

module_auxiliary_driver(class_function_drv);

sound/soc/sdca/sdca_interrupts.c

+3 −4
Original line number Diff line number Diff line
@@ -555,17 +555,16 @@ EXPORT_SYMBOL_NS_GPL(sdca_irq_populate, "SND_SOC_SDCA"); 


/**

 * sdca_irq_cleanup - Free all the individual IRQs for an SDCA Function

 * @sdev: Device pointer against which the sdca_interrupt_info was allocated.

 * @function: Pointer to the SDCA Function.

 * @component: Pointer to the ASoC component for the Function.

 * @info: Pointer to the SDCA interrupt info for this device.

 *

 * Typically this would be called from the driver for a single SDCA Function.

 */

void sdca_irq_cleanup(struct sdca_function_data *function,

		      struct snd_soc_component *component,

void sdca_irq_cleanup(struct device *dev,

		      struct sdca_function_data *function,

		      struct sdca_interrupt_info *info)

{

	struct device *dev = component->dev;

	int i;



	guard(mutex)(&info->irq_lock);