Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-20 23:13:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

ASoC: codecs: lpass-rx-macro: Simplify PDS cleanup with devm

Browse Source 
Eliminate PDS cleanup by using devm_add_action_or_reset() which results
in one less error path and smaller cleanup in remove().

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20240701-b4-qcom-audio-lpass-codec-cleanups-v3-1-6d98d4dd1ef5@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Krzysztof Kozlowski 2024-07-01 09:39:33 +02:00 committed by Mark Brown
parent e15cc906b9
commit 891168dc4a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/codecs/lpass-macro-common.h
View File

@ -41,6 +41,11 @@ void lpass_macro_pds_exit(struct lpass_macro *pds);
void lpass_macro_set_codec_version(enum lpass_codec_version version);
enum lpass_codec_version lpass_macro_get_codec_version(void);
static inline void lpass_macro_pds_exit_action(void *pds)
{
lpass_macro_pds_exit(pds);
}
static inline const char *lpass_macro_get_codec_version_string(int version)
{
switch (version) {

30
sound/soc/codecs/lpass-rx-macro.c
View File

@ -3803,11 +3803,14 @@ static int rx_macro_probe(struct platform_device *pdev)
if (IS_ERR(rx->pds))
return PTR_ERR(rx->pds);
ret = devm_add_action_or_reset(dev, lpass_macro_pds_exit_action, rx->pds);
if (ret)
return ret;
base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base)) {
ret = PTR_ERR(base);
goto err;
}
if (IS_ERR(base))
return PTR_ERR(base);
rx->codec_version = lpass_macro_get_codec_version();
switch (rx->codec_version) {
case LPASS_CODEC_VERSION_1_0:
@ -3818,10 +3821,8 @@ static int rx_macro_probe(struct platform_device *pdev)
rx->rxn_reg_stride = 0x80;
def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_pre_2_5_defaults);
reg_defaults = kmalloc_array(def_count, sizeof(struct reg_default), GFP_KERNEL);
if (!reg_defaults) {
ret = -ENOMEM;
goto err;
}
if (!reg_defaults)
return -ENOMEM;
memcpy(&reg_defaults[0], rx_defaults, sizeof(rx_defaults));
memcpy(&reg_defaults[ARRAY_SIZE(rx_defaults)],
rx_pre_2_5_defaults, sizeof(rx_pre_2_5_defaults));
@ -3833,18 +3834,15 @@ static int rx_macro_probe(struct platform_device *pdev)
rx->rxn_reg_stride = 0xc0;
def_count = ARRAY_SIZE(rx_defaults) + ARRAY_SIZE(rx_2_5_defaults);
reg_defaults = kmalloc_array(def_count, sizeof(struct reg_default), GFP_KERNEL);
if (!reg_defaults) {
ret = -ENOMEM;
goto err;
}
if (!reg_defaults)
return -ENOMEM;
memcpy(&reg_defaults[0], rx_defaults, sizeof(rx_defaults));
memcpy(&reg_defaults[ARRAY_SIZE(rx_defaults)],
rx_2_5_defaults, sizeof(rx_2_5_defaults));
break;
default:
dev_err(dev, "Unsupported Codec version (%d)\n", rx->codec_version);
ret = -EINVAL;
goto err;
return -EINVAL;
}
rx_regmap_config.reg_defaults = reg_defaults;
@ -3927,8 +3925,6 @@ err_dcodec:
clk_disable_unprepare(rx->macro);
err_ver:
kfree(reg_defaults);
err:
lpass_macro_pds_exit(rx->pds);
return ret;
}
@ -3942,8 +3938,6 @@ static void rx_macro_remove(struct platform_device *pdev)
clk_disable_unprepare(rx->fsgen);
clk_disable_unprepare(rx->macro);
clk_disable_unprepare(rx->dcodec);
lpass_macro_pds_exit(rx->pds);
}
static const struct of_device_id rx_macro_dt_match[] = {