From nobody Thu Oct 31 02:20:45 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 671F5CE7B1C for ; Thu, 28 Sep 2023 10:59:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231897AbjI1K7J (ORCPT ); Thu, 28 Sep 2023 06:59:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57556 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231767AbjI1K7E (ORCPT ); Thu, 28 Sep 2023 06:59:04 -0400 Received: from out28-50.mail.aliyun.com (out28-50.mail.aliyun.com [115.124.28.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27931CCD; Thu, 28 Sep 2023 03:58:59 -0700 (PDT) X-Alimail-AntiSpam: AC=CONTINUE;BC=0.06718685|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_system_inform|0.00748265-0.000710643-0.991807;FP=10256080768311561946|1|1|20|0|-1|-1|-1;HT=ay29a033018047188;MF=wangweidong.a@awinic.com;NM=1;PH=DS;RN=30;RT=30;SR=0;TI=SMTPD_---.UqYH9MG_1695898727; Received: from ubuntu-VirtualBox..(mailfrom:wangweidong.a@awinic.com fp:SMTPD_---.UqYH9MG_1695898727) by smtp.aliyun-inc.com; Thu, 28 Sep 2023 18:58:55 +0800 From: wangweidong.a@awinic.com To: girdwood@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, rf@opensource.cirrus.com, shumingf@realtek.com, herve.codina@bootlin.com, rdunlap@infradead.org, 13916275206@139.com, ryans.lee@analog.com, linus.walleij@linaro.org, ckeepax@opensource.cirrus.com, doug@schmorgal.com, ajye_huang@compal.corp-partner.google.com, harshit.m.mogalapalli@oracle.com, arnd@arndb.de, yang.lee@linux.alibaba.com, u.kleine-koenig@pengutronix.de, liweilei@awinic.com, yijiangtao@awinic.com, trix@redhat.com, dan.carpenter@linaro.org, colin.i.king@gmail.com, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH V6 09/10] ASoC: codecs: Modify the transmission mode of function parameters Date: Thu, 28 Sep 2023 18:57:26 +0800 Message-ID: <20230928105727.47273-10-wangweidong.a@awinic.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230928105727.47273-1-wangweidong.a@awinic.com> References: <20230928105727.47273-1-wangweidong.a@awinic.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Weidong Wang Change the transmission mode of the "aw88261_dev_get_prof_name" function parameter Signed-off-by: Weidong Wang --- 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 *aw882= 61, return ret; } =20 -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 =3D &aw_dev->prof_info; struct aw_prof_desc *prof_desc; @@ -485,12 +485,14 @@ static char *aw88261_dev_get_prof_name(struct aw_devi= ce *aw_dev, int index) if ((index >=3D 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; } =20 prof_desc =3D &aw_dev->prof_info.prof_desc[index]; =20 - return prof_info->prof_name_list[prof_desc->id]; + *prof_name =3D prof_info->prof_name_list[prof_desc->id]; + + return 0; } =20 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 *aw8826= 1) char *prof_name; int ret; =20 - prof_name =3D aw88261_dev_get_prof_name(aw_dev, aw_dev->prof_index); - if (!prof_name) { + ret =3D 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 *kc= ontrol, { struct snd_soc_component *codec =3D snd_soc_kcontrol_component(kcontrol); struct aw88261 *aw88261 =3D snd_soc_component_get_drvdata(codec); - const char *prof_name; - char *name; - int count; + char *prof_name, *name; + int count, ret; =20 uinfo->type =3D SNDRV_CTL_ELEM_TYPE_ENUMERATED; uinfo->count =3D 1; @@ -839,8 +840,8 @@ static int aw88261_profile_info(struct snd_kcontrol *kc= ontrol, name =3D uinfo->value.enumerated.name; count =3D uinfo->value.enumerated.item; =20 - prof_name =3D aw88261_dev_get_prof_name(aw88261->aw_pa, count); - if (!prof_name) { + ret =3D aw88261_dev_get_prof_name(aw88261->aw_pa, count, &prof_name); + if (ret) { strscpy(uinfo->value.enumerated.name, "null", strlen("null") + 1); return 0; --=20 2.41.0