ASoC: topology: Rename soc_tplg_init_kcontrol() function

Other functions used for callbacks are named after function they call,
however function calling control_load seems to be an exception. Rename
it to soc_tplg_control_load().

Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Cezary Rojewski <cezary.rojewski@intel.com>
Link: https://lore.kernel.org/r/20220401120200.4047867-7-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c
index 3390bf0f82957bac37101c4beb48c7c893ffcb1a..ddbc05306a8f4f55d614d195a637b41ed19cf259 100644 (file)
--- a/sound/soc/soc-topology.c
+++ b/sound/soc/soc-topology.c
@@ -618,7 +618,7 @@ int snd_soc_tplg_widget_bind_event(struct snd_soc_dapm_widget *w,
 EXPORT_SYMBOL_GPL(snd_soc_tplg_widget_bind_event);
 
 /* optionally pass new dynamic kcontrol to component driver. */
-static int soc_tplg_init_kcontrol(struct soc_tplg *tplg,
+static int soc_tplg_control_load(struct soc_tplg *tplg,
        struct snd_kcontrol_new *k, struct snd_soc_tplg_ctl_hdr *hdr)
 {
        if (tplg->ops && tplg->ops->control_load)
@@ -725,7 +725,7 @@ static int soc_tplg_dbytes_create(struct soc_tplg *tplg, size_t size)
        }
 
        /* pass control to driver for optional further init */
-       ret = soc_tplg_init_kcontrol(tplg, &kc, (struct snd_soc_tplg_ctl_hdr *)be);
+       ret = soc_tplg_control_load(tplg, &kc, (struct snd_soc_tplg_ctl_hdr *)be);
        if (ret < 0) {
                dev_err(tplg->dev, "ASoC: failed to init %s\n", be->hdr.name);
                goto err;
@@ -809,7 +809,7 @@ static int soc_tplg_dmixer_create(struct soc_tplg *tplg, size_t size)
        }
 
        /* pass control to driver for optional further init */
-       ret = soc_tplg_init_kcontrol(tplg, &kc, (struct snd_soc_tplg_ctl_hdr *)mc);
+       ret = soc_tplg_control_load(tplg, &kc, (struct snd_soc_tplg_ctl_hdr *)mc);
        if (ret < 0) {
                dev_err(tplg->dev, "ASoC: failed to init %s\n", mc->hdr.name);
                goto err;
@@ -977,7 +977,7 @@ static int soc_tplg_denum_create(struct soc_tplg *tplg, size_t size)
        }
 
        /* pass control to driver for optional further init */
-       ret = soc_tplg_init_kcontrol(tplg, &kc, (struct snd_soc_tplg_ctl_hdr *)ec);
+       ret = soc_tplg_control_load(tplg, &kc, (struct snd_soc_tplg_ctl_hdr *)ec);
        if (ret < 0) {
                dev_err(tplg->dev, "ASoC: failed to init %s\n", ec->hdr.name);
                goto err;
@@ -1193,8 +1193,7 @@ static int soc_tplg_dapm_widget_dmixer_create(struct soc_tplg *tplg, struct snd_
        }
 
        /* pass control to driver for optional further init */
-       err = soc_tplg_init_kcontrol(tplg, kc,
-                                    (struct snd_soc_tplg_ctl_hdr *)mc);
+       err = soc_tplg_control_load(tplg, kc, (struct snd_soc_tplg_ctl_hdr *)mc);
        if (err < 0) {
                dev_err(tplg->dev, "ASoC: failed to init %s\n",
                        mc->hdr.name);
@@ -1278,8 +1277,7 @@ static int soc_tplg_dapm_widget_denum_create(struct soc_tplg *tplg, struct snd_k
        }
 
        /* pass control to driver for optional further init */
-       err = soc_tplg_init_kcontrol(tplg, kc,
-                                    (struct snd_soc_tplg_ctl_hdr *)ec);
+       err = soc_tplg_control_load(tplg, kc, (struct snd_soc_tplg_ctl_hdr *)ec);
        if (err < 0) {
                dev_err(tplg->dev, "ASoC: failed to init %s\n",
                        ec->hdr.name);
@@ -1331,8 +1329,7 @@ static int soc_tplg_dapm_widget_dbytes_create(struct soc_tplg *tplg, struct snd_
        }
 
        /* pass control to driver for optional further init */
-       err = soc_tplg_init_kcontrol(tplg, kc,
-                                    (struct snd_soc_tplg_ctl_hdr *)be);
+       err = soc_tplg_control_load(tplg, kc, (struct snd_soc_tplg_ctl_hdr *)be);
        if (err < 0) {
                dev_err(tplg->dev, "ASoC: failed to init %s\n",
                        be->hdr.name);