Received: by 2002:a05:7412:2a8c:b0:e2:908c:2ebd with SMTP id u12csp3166940rdh; Thu, 28 Sep 2023 04:56:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQ50r2XE4CLZ0LceLF0hnk0JEeAoWS6wXMeo3un3sr2dvAsUr8ezcOL4/SeWgUI6FN31dG X-Received: by 2002:a05:6808:13cf:b0:3ad:ffa4:e003 with SMTP id d15-20020a05680813cf00b003adffa4e003mr1142583oiw.33.1695902163543; Thu, 28 Sep 2023 04:56:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695902163; cv=none; d=google.com; s=arc-20160816; b=rIRIL6Kdg7WgE7Oyi1GUETE2ahs4KdemmHGaxAgnlEwUmOd9L75+Gzeu6NXgdq1idX 0vYqZp7MlGvsCatZFR2GbNJ1Yi0NHz4loERuDx4LLC7jZx8AvntTJyJC+C6JqSsSigw+ wCkPN/NJEuohoS43Ctx6+VPDiM9YymG4kPQaGTqnCMSrawA4Rl+SJo8lNMWjKSAkNPq1 7vfEVcsXssHvYlAAV88EJLKe8I2SkNBsEjpTr+7EoGTxnDtIQRhTP5q2a2YwmMY0KiiH tW7sZu5O0MtzpXCn3QEDnh7BffaTiKXvNrmVFguce/3vL0ARcVTqd70NzpHCf/5/CQ6r h6pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:to:from; bh=rwmPtG/VC7SIlUkUVqqraxQXqyjbV6Kk3NxA0Di1IS0=; fh=uAHJyyPUpn6IrkkiorP+jZGHnZM9HKgISwDYoF12jww=; b=inXVCzU0CHDB3x08LonZeQYMcER8Ei+/UVzt3zh3tpOJSVA+fAtHL4K/HPyqKajoko r8Si0LVKnFMQQheHQj4LKZlpWIYtN9GmrBXJsDwBuYEaLWdgBJzwQhcKc9B4wDJpTWTt rHd2zRBntdY4So5+rRy+z50WPCAMireHYvw8SDtuvFvyEEpNhWeE+mFLhA2E8eJ+Uzm+ C3bnYRRAA6rgK1DCvnMD+uC3GDxJDwPo3PFd0ezTgK1dOjKEguJAuEqCgrMpx6i3KgCn KFXc76nALvOBx6YnIu13ZIo88esN0KSRQ5cHUoVFsR+LKQmmq2gq+txOZG8+j9FRocAw EE8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id by6-20020a056a00400600b0068fc2f7cef3si17316875pfb.358.2023.09.28.04.56.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Sep 2023 04:56:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 4E2DF82EBE62; Thu, 28 Sep 2023 03:59:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231705AbjI1K7H (ORCPT + 99 others); Thu, 28 Sep 2023 06:59:07 -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: 8bit X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 28 Sep 2023 03:59:12 -0700 (PDT) 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 *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