From: wangweidong.a@awinic.com
To: lgirdwood@gmail.com, broonie@kernel.org, robh+dt@kernel.org,
krzysztof.kozlowski+dt@linaro.org, conor+dt@kernel.org,
perex@perex.cz, tiwai@suse.com, wangweidong.a@awinic.com,
shumingf@realtek.com, rf@opensource.cirrus.com,
herve.codina@bootlin.com, arnd@arndb.de, 13916275206@139.com,
ryans.lee@analog.com, linus.walleij@linaro.org,
ckeepax@opensource.cirrus.com, doug@schmorgal.com,
fido_max@inbox.ru, harshit.m.mogalapalli@oracle.com,
liweilei@awinic.com, yang.lee@linux.alibaba.com,
u.kleine-koenig@pengutronix.de, yijiangtao@awinic.com,
dan.carpenter@linaro.org, colin.i.king@gmail.com,
trix@redhat.com, alsa-devel@alsa-project.org,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH V5 7/8] ASoC: codecs: Modify the transmission mode of function parameters
Date: Wed, 27 Sep 2023 20:16:33 +0800 [thread overview]
Message-ID: <20230927121634.94822-8-wangweidong.a@awinic.com> (raw)
In-Reply-To: <20230927121634.94822-1-wangweidong.a@awinic.com>
From: Weidong Wang <wangweidong.a@awinic.com>
Change the transmission mode of the "aw88261_dev_get_prof_name"
function parameter
Signed-off-by: Weidong Wang <wangweidong.a@awinic.com>
---
sound/soc/codecs/aw88261.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c
index 61179e235fbf..45eaf931a69c 100644
--- a/sound/soc/codecs/aw88261.c
+++ b/sound/soc/codecs/aw88261.c
@@ -477,7 +477,7 @@ static int aw88261_dev_reg_update(struct aw88261 *aw88261,
return ret;
}
-static char *aw88261_dev_get_prof_name(struct aw_device *aw_dev, int index)
+static int aw88261_dev_get_prof_name(struct aw_device *aw_dev, int index, char **prof_name)
{
struct aw_prof_info *prof_info = &aw_dev->prof_info;
struct aw_prof_desc *prof_desc;
@@ -485,12 +485,14 @@ static char *aw88261_dev_get_prof_name(struct aw_device *aw_dev, int index)
if ((index >= aw_dev->prof_info.count) || (index < 0)) {
dev_err(aw_dev->dev, "index[%d] overflow count[%d]",
index, aw_dev->prof_info.count);
- return NULL;
+ return -EINVAL;
}
prof_desc = &aw_dev->prof_info.prof_desc[index];
- return prof_info->prof_name_list[prof_desc->id];
+ *prof_name = prof_info->prof_name_list[prof_desc->id];
+
+ return 0;
}
static int aw88261_dev_get_prof_data(struct aw_device *aw_dev, int index,
@@ -515,8 +517,8 @@ static int aw88261_dev_fw_update(struct aw88261 *aw88261)
char *prof_name;
int ret;
- prof_name = aw88261_dev_get_prof_name(aw_dev, aw_dev->prof_index);
- if (!prof_name) {
+ ret = aw88261_dev_get_prof_name(aw_dev, aw_dev->prof_index, &prof_name);
+ if (ret) {
dev_err(aw_dev->dev, "get prof name failed");
return -EINVAL;
}
@@ -818,9 +820,8 @@ static int aw88261_profile_info(struct snd_kcontrol *kcontrol,
{
struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);
struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);
- const char *prof_name;
- char *name;
- int count;
+ char *prof_name, *name;
+ int count, ret;
uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
uinfo->count = 1;
@@ -839,8 +840,8 @@ static int aw88261_profile_info(struct snd_kcontrol *kcontrol,
name = uinfo->value.enumerated.name;
count = uinfo->value.enumerated.item;
- prof_name = aw88261_dev_get_prof_name(aw88261->aw_pa, count);
- if (!prof_name) {
+ ret = aw88261_dev_get_prof_name(aw88261->aw_pa, count, &prof_name);
+ if (ret) {
strscpy(uinfo->value.enumerated.name, "null",
strlen("null") + 1);
return 0;
--
2.41.0
next prev parent reply other threads:[~2023-09-27 12:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-27 12:16 [PATCH V5 0/8] ASoC: codecs: Add aw87390 amplifier driver wangweidong.a
2023-09-27 12:16 ` [PATCH V5 1/8] ASoC: dt-bindings: awinic,aw88395: Add properties for multiple PA support wangweidong.a
2023-09-27 12:16 ` [PATCH V5 2/8] ASoC: dt-bindings: Add schema for "awinic,aw87390" wangweidong.a
2023-09-27 12:16 ` [PATCH V5 3/8] ASoC: codecs: Modify the code related to the property wangweidong.a
2023-09-27 13:12 ` Dan Carpenter
2023-09-27 12:16 ` [PATCH V5 4/8] ASoC: codecs: Modify the transmission method of parameters wangweidong.a
2023-09-27 12:16 ` [PATCH V5 5/8] ASoC: codecs: Add code for bin parsing compatible with aw87390 wangweidong.a
2023-09-27 12:16 ` [PATCH V5 6/8] ASoC: codecs: Modify the code related to the property wangweidong.a
2023-09-27 13:22 ` Dan Carpenter
2023-09-27 12:16 ` wangweidong.a [this message]
2023-09-27 12:16 ` [PATCH V5 8/8] ASoC: codecs: Add aw87390 amplifier driver wangweidong.a
2023-09-27 14:31 ` Dan Carpenter
2023-09-28 6:43 ` wangweidong.a
2023-09-28 6:59 ` Dan Carpenter
2023-09-28 14:51 ` [PATCH V5 0/8] " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230927121634.94822-8-wangweidong.a@awinic.com \
--to=wangweidong.a@awinic.com \
--cc=13916275206@139.com \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=colin.i.king@gmail.com \
--cc=conor+dt@kernel.org \
--cc=dan.carpenter@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=doug@schmorgal.com \
--cc=fido_max@inbox.ru \
--cc=harshit.m.mogalapalli@oracle.com \
--cc=herve.codina@bootlin.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=lgirdwood@gmail.com \
--cc=linus.walleij@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liweilei@awinic.com \
--cc=perex@perex.cz \
--cc=rf@opensource.cirrus.com \
--cc=robh+dt@kernel.org \
--cc=ryans.lee@analog.com \
--cc=shumingf@realtek.com \
--cc=tiwai@suse.com \
--cc=trix@redhat.com \
--cc=u.kleine-koenig@pengutronix.de \
--cc=yang.lee@linux.alibaba.com \
--cc=yijiangtao@awinic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®