diff --git a/asoc/codecs/cs35l41/cs35l41.c b/asoc/codecs/cs35l41/cs35l41.c
index edaddf38335d..25db86058e47 100755
--- a/asoc/codecs/cs35l41/cs35l41.c
+++ b/asoc/codecs/cs35l41/cs35l41.c
@@ -215,7 +215,7 @@ static int vendor_id_get(struct snd_kcontrol *kcontrol,
 	ucontrol->value.integer.value[0] = VENDOR_ID_NONE;
 
 	if (cs35l41->pdata.spk_id_gpio_p)
-		ucontrol->value.integer.value[0] = spk_id_get(cs35l41->pdata.spk_id_gpio_p);
+		ucontrol->value.integer.value[0] = cs35l41_spk_id_get(cs35l41->pdata.spk_id_gpio_p);
 
 	return 0;
 }
@@ -1646,7 +1646,7 @@ static struct snd_soc_codec_driver soc_codec_dev_cs35l41 = {
 	.idle_bias_off = true,
 };
 
-int spk_id_get(struct device_node *np)
+int cs35l41_spk_id_get(struct device_node *np)
 {
 	int id;
 	int state;
@@ -1742,7 +1742,7 @@ static int cs35l41_handle_of_data(struct device *dev,
 		"cirrus,spk-id-pin", np->full_name);
 		pdata->mnSpkType = VENDOR_ID_NONE;
 	} else {
-		pdata->mnSpkType = spk_id_get(pdata->spk_id_gpio_p);
+		pdata->mnSpkType = cs35l41_spk_id_get(pdata->spk_id_gpio_p);
 	}
 	dev_info(dev, "spk is is %d", pdata->mnSpkType);
 
diff --git a/asoc/codecs/tas2557/tas2557-codec.c b/asoc/codecs/tas2557/tas2557-codec.c
index 06de3fd7bc43..5aec1fe87c67 100755
--- a/asoc/codecs/tas2557/tas2557-codec.c
+++ b/asoc/codecs/tas2557/tas2557-codec.c
@@ -330,7 +330,7 @@ static int vendor_id_get(struct snd_kcontrol *kcontrol,
 		ucontrol->value.integer.value[0] = VENDOR_ID_NONE;
 
 		if (pTAS2557->spk_id_gpio_p)
-			ucontrol->value.integer.value[0] = spk_id_get(pTAS2557->spk_id_gpio_p);
+			ucontrol->value.integer.value[0] = tas2557_spk_id_get(pTAS2557->spk_id_gpio_p);
 
 		return 0;
 }
diff --git a/asoc/codecs/tas2557/tas2557-core.c b/asoc/codecs/tas2557/tas2557-core.c
index cc385b2cdaa4..d95c46ec9a80 100755
--- a/asoc/codecs/tas2557/tas2557-core.c
+++ b/asoc/codecs/tas2557/tas2557-core.c
@@ -2051,7 +2051,7 @@ end:
 	return bFound;
 }
 
-int spk_id_get(struct device_node *np)
+int tas2557_spk_id_get(struct device_node *np)
 {
 	int id;
 	int state;
@@ -2092,7 +2092,7 @@ int tas2557_parse_dt(struct device *dev, struct tas2557_priv *pTAS2557)
 		"ti,spk-id-pin", np->full_name);
 		pTAS2557->mnSpkType = VENDOR_ID_NONE;
 	} else {
-		pTAS2557->mnSpkType = spk_id_get(pTAS2557->spk_id_gpio_p);
+		pTAS2557->mnSpkType = tas2557_spk_id_get(pTAS2557->spk_id_gpio_p);
 	}
 	dev_dbg(pTAS2557->dev, "spk is is %d", pTAS2557->mnSpkType);
 
diff --git a/asoc/codecs/tas2557/tas2557-core.h b/asoc/codecs/tas2557/tas2557-core.h
index 5081d5bb4364..4d72ddadefbc 100755
--- a/asoc/codecs/tas2557/tas2557-core.h
+++ b/asoc/codecs/tas2557/tas2557-core.h
@@ -76,6 +76,6 @@ int tas2557_parse_dt(struct device *dev, struct tas2557_priv *pTAS2557);
 int tas2557_get_DAC_gain(struct tas2557_priv *pTAS2557, unsigned char *pnGain);
 int tas2557_set_DAC_gain(struct tas2557_priv *pTAS2557, unsigned int nGain);
 int tas2557_configIRQ(struct tas2557_priv *pTAS2557);
-int spk_id_get(struct device_node *np);
+int tas2557_spk_id_get(struct device_node *np);
 
 #endif /* _TAS2557_CORE_H */
diff --git a/include/uapi/sound/cs35l41.h b/include/uapi/sound/cs35l41.h
index a3f7e537f6b8..7a2fb19d825d 100755
--- a/include/uapi/sound/cs35l41.h
+++ b/include/uapi/sound/cs35l41.h
@@ -79,5 +79,5 @@ struct cs35l41_private {
 
 int cs35l41_probe(struct cs35l41_private *cs35l41,
 				struct cs35l41_platform_data *pdata);
-int spk_id_get(struct device_node *np);
+int cs35l41_spk_id_get(struct device_node *np);
 #endif /* __CS35L41_H */