ASoC: codecs: Modify the transmission mode of function parameters

Change the transmission mode of the "aw88261_dev_get_prof_name"
function parameter

Signed-off-by: Weidong Wang <wangweidong.a@awinic.com>
Link: https://lore.kernel.org/r/20230928105727.47273-10-wangweidong.a@awinic.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c
index 61179e235fbfeb240e203ac7945a971da76a0825..45eaf931a69cc87bb95733201ed5b4a6011f3168 100644 (file)
--- 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;