[PATCH 1/2] ASoC: tas5805m: Use scope-based resource management in tas5805m_i2c_probe()

From: Markus Elfring
Date: Mon Sep 16 2024 - 04:48:49 EST


From: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
Date: Mon, 16 Sep 2024 10:11:59 +0200

Scope-based resource management became supported also for another
programming interface by contributions of Dmitry Torokhov on 2024-01-17.
See also the commit 8dde8fa0cc3edce73c050b9882d06c1a575f6402
("firmware_loader: introduce __free() cleanup hanler").

* Thus use the attribute “__free(firmware)”.

* Reduce the scope for the local variable “fw”.

* Omit explicit release_firmware() calls accordingly.


This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@xxxxxxxxxxxxxxxxxxxxx>
---
sound/soc/codecs/tas5805m.c | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/sound/soc/codecs/tas5805m.c b/sound/soc/codecs/tas5805m.c
index 3b53eba38a0b..f37eec960364 100644
--- a/sound/soc/codecs/tas5805m.c
+++ b/sound/soc/codecs/tas5805m.c
@@ -464,7 +464,6 @@ static int tas5805m_i2c_probe(struct i2c_client *i2c)
struct tas5805m_priv *tas5805m;
char filename[128];
const char *config_name;
- const struct firmware *fw;
int ret;

regmap = devm_regmap_init_i2c(i2c, &tas5805m_regmap);
@@ -509,24 +508,24 @@ static int tas5805m_i2c_probe(struct i2c_client *i2c)

snprintf(filename, sizeof(filename), "tas5805m_dsp_%s.bin",
config_name);
- ret = request_firmware(&fw, filename, dev);
- if (ret)
- return ret;

- if ((fw->size < 2) || (fw->size & 1)) {
- dev_err(dev, "firmware is invalid\n");
- release_firmware(fw);
- return -EINVAL;
- }
+ {
+ struct firmware const *fw __free(firmware) = NULL;

- tas5805m->dsp_cfg_len = fw->size;
- tas5805m->dsp_cfg_data = devm_kmemdup(dev, fw->data, fw->size, GFP_KERNEL);
- if (!tas5805m->dsp_cfg_data) {
- release_firmware(fw);
- return -ENOMEM;
- }
+ ret = request_firmware(&fw, filename, dev);
+ if (ret)
+ return ret;
+
+ if ((fw->size < 2) || (fw->size & 1)) {
+ dev_err(dev, "firmware is invalid\n");
+ return -EINVAL;
+ }

- release_firmware(fw);
+ tas5805m->dsp_cfg_len = fw->size;
+ tas5805m->dsp_cfg_data = devm_kmemdup(dev, fw->data, fw->size, GFP_KERNEL);
+ if (!tas5805m->dsp_cfg_data)
+ return -ENOMEM;
+ }

/* Do the first part of the power-on here, while we can expect
* the I2S interface to be quiet. We must raise PDN# and then
--
2.46.0