[PATCH 04/21] ASoC: twl4030: Acquire board params and hs_extmute GPIO in the platform probe
From: Chancel Liu
Date: Mon Sep 21 2026 - 06:54:12 EST
From: Chancel Liu <chancel.liu@xxxxxxx>
The component .probe/.remove callbacks fire on ASoC card bind/unbind, but
component->dev is the underlying platform device whose devres is only
released on physical device removal. Resources allocated with
devm_*(component->dev, ...) in the component probe are therefore never
freed on card unbind, leaking one copy per bind/unbind cycle and leaking
the hs_extmute GPIO descriptor (which can also fail to be re-acquired on
re-bind).
The board parameters and the hs_extmute GPIO are pure hardware/device
level resources: they only depend on the physical device and the DT, not
on the ASoC component. Acquire them (together with the driver context)
in twl4030_codec_probe() using devm on the platform device, and hand the
context to the component through drvdata. Their devres lifetime then
correctly follows the device rather than the card bind/unbind, so no
explicit component .remove is needed. The component probe keeps only the
codec register initialisation that genuinely needs the component.
Signed-off-by: Chancel Liu <chancel.liu@xxxxxxx>
---
sound/soc/codecs/twl4030.c | 63 +++++++++++++++++++++++++-------------
1 file changed, 42 insertions(+), 21 deletions(-)
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index b986ece55d5a..442624cf2a31 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -212,21 +212,21 @@ twl4030_get_board_param_values(struct twl4030_board_params *board_params,
}
static struct twl4030_board_params*
-twl4030_get_board_params(struct snd_soc_component *component)
+twl4030_get_board_params(struct device *dev)
{
struct twl4030_board_params *board_params = NULL;
struct device_node *twl4030_codec_node = NULL;
- twl4030_codec_node = of_get_child_by_name(component->dev->parent->of_node,
+ twl4030_codec_node = of_get_child_by_name(dev->parent->of_node,
"codec");
if (twl4030_codec_node) {
- board_params = devm_kzalloc(component->dev,
+ board_params = devm_kzalloc(dev,
sizeof(struct twl4030_board_params),
GFP_KERNEL);
if (!board_params) {
of_node_put(twl4030_codec_node);
- return NULL;
+ return ERR_PTR(-ENOMEM);
}
twl4030_get_board_param_values(board_params, twl4030_codec_node);
of_node_put(twl4030_codec_node);
@@ -235,21 +235,22 @@ twl4030_get_board_params(struct snd_soc_component *component)
return board_params;
}
-static int twl4030_init_chip(struct snd_soc_component *component)
+static int twl4030_get_hw_params(struct device *dev,
+ struct twl4030_priv *twl4030)
{
struct twl4030_board_params *board_params;
- struct twl4030_priv *twl4030 = snd_soc_component_get_drvdata(component);
- u8 reg, byte;
- int i = 0;
- board_params = twl4030_get_board_params(component);
+ board_params = twl4030_get_board_params(dev);
+ if (IS_ERR(board_params))
+ return PTR_ERR(board_params);
if (board_params && board_params->hs_extmute) {
- board_params->hs_extmute_gpio = devm_gpiod_get_optional(component->dev,
+ board_params->hs_extmute_gpio = devm_gpiod_get_optional(dev,
"ti,hs_extmute",
GPIOD_OUT_LOW);
if (IS_ERR(board_params->hs_extmute_gpio))
- return dev_err_probe(component->dev, PTR_ERR(board_params->hs_extmute_gpio),
+ return dev_err_probe(dev,
+ PTR_ERR(board_params->hs_extmute_gpio),
"Failed to get hs_extmute GPIO\n");
if (board_params->hs_extmute_gpio) {
@@ -257,7 +258,7 @@ static int twl4030_init_chip(struct snd_soc_component *component)
} else {
u8 pin_mux;
- dev_info(component->dev, "use TWL4030 GPIO6\n");
+ dev_info(dev, "use TWL4030 GPIO6\n");
/* Set TWL4030 GPIO6 as EXTMUTE signal */
twl_i2c_read_u8(TWL4030_MODULE_INTBR, &pin_mux,
@@ -269,6 +270,18 @@ static int twl4030_init_chip(struct snd_soc_component *component)
}
}
+ twl4030->board_params = board_params;
+
+ return 0;
+}
+
+static int twl4030_init_chip(struct snd_soc_component *component)
+{
+ struct twl4030_priv *twl4030 = snd_soc_component_get_drvdata(component);
+ struct twl4030_board_params *board_params = twl4030->board_params;
+ u8 reg, byte;
+ int i = 0;
+
/* Initialize the local ctl register cache */
tw4030_init_ctl_cache(twl4030);
@@ -288,8 +301,6 @@ static int twl4030_init_chip(struct snd_soc_component *component)
if (!board_params)
return 0;
- twl4030->board_params = board_params;
-
reg = twl4030_read(component, TWL4030_REG_HS_POPN_SET);
reg &= ~TWL4030_RAMP_DELAY;
reg |= (board_params->ramp_delay_value << 2);
@@ -2163,15 +2174,9 @@ static struct snd_soc_dai_driver twl4030_dai[] = {
static int twl4030_soc_probe(struct snd_soc_component *component)
{
- struct twl4030_priv *twl4030;
+ struct twl4030_priv *twl4030 = dev_get_drvdata(component->dev);
- twl4030 = devm_kzalloc(component->dev, sizeof(struct twl4030_priv),
- GFP_KERNEL);
- if (!twl4030)
- return -ENOMEM;
snd_soc_component_set_drvdata(component, twl4030);
- /* Set the defaults, and power up the codec */
- twl4030->sysclk = twl4030_audio_get_mclk() / 1000;
return twl4030_init_chip(component);
}
@@ -2193,6 +2198,22 @@ static const struct snd_soc_component_driver soc_component_dev_twl4030 = {
static int twl4030_codec_probe(struct platform_device *pdev)
{
+ struct twl4030_priv *twl4030;
+ int ret;
+
+ twl4030 = devm_kzalloc(&pdev->dev, sizeof(*twl4030), GFP_KERNEL);
+ if (!twl4030)
+ return -ENOMEM;
+
+ /* Set the defaults, and power up the codec */
+ twl4030->sysclk = twl4030_audio_get_mclk() / 1000;
+
+ ret = twl4030_get_hw_params(&pdev->dev, twl4030);
+ if (ret)
+ return ret;
+
+ platform_set_drvdata(pdev, twl4030);
+
return devm_snd_soc_register_component(&pdev->dev,
&soc_component_dev_twl4030,
twl4030_dai, ARRAY_SIZE(twl4030_dai));
--
2.50.1