1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
diff --git a/include/sound/soc_sdw_utils.h b/include/sound/soc_sdw_utils.h
index 227347c8f0b3..9d8a13ca9139 100644
--- a/include/sound/soc_sdw_utils.h
+++ b/include/sound/soc_sdw_utils.h
@@ -267,7 +267,5 @@ int asoc_sdw_ti_amp_init(struct snd_soc_card *card,
struct asoc_sdw_codec_info *info,
bool playback);
int asoc_sdw_ti_spk_rtd_init(struct snd_soc_pcm_runtime *rtd, struct snd_soc_dai *dai);
-int asoc_sdw_ti_amp_initial_settings(struct snd_soc_card *card,
- const char *name_prefix);
#endif
diff --git a/sound/soc/sdw_utils/soc_sdw_ti_amp.c b/sound/soc/sdw_utils/soc_sdw_ti_amp.c
index 488ef2ef45d4..e26462c87261 100644
--- a/sound/soc/sdw_utils/soc_sdw_ti_amp.c
+++ b/sound/soc/sdw_utils/soc_sdw_ti_amp.c
@@ -12,31 +12,6 @@
#include <sound/soc-dai.h>
#include <sound/soc_sdw_utils.h>
-#define TIAMP_SPK_VOLUME_0DB 200
-
-int asoc_sdw_ti_amp_initial_settings(struct snd_soc_card *card,
- const char *name_prefix)
-{
- char *volume_ctl_name;
- int ret;
-
- volume_ctl_name = kasprintf(GFP_KERNEL, "%s Speaker Volume",
- name_prefix);
- if (!volume_ctl_name)
- return -ENOMEM;
-
- ret = snd_soc_limit_volume(card, volume_ctl_name,
- TIAMP_SPK_VOLUME_0DB);
- if (ret)
- dev_err(card->dev,
- "%s update failed %d\n",
- volume_ctl_name, ret);
-
- kfree(volume_ctl_name);
- return 0;
-}
-EXPORT_SYMBOL_NS(asoc_sdw_ti_amp_initial_settings, "SND_SOC_SDW_UTILS");
-
int asoc_sdw_ti_spk_rtd_init(struct snd_soc_pcm_runtime *rtd,
struct snd_soc_dai *dai)
{
@@ -69,9 +44,6 @@ int asoc_sdw_ti_spk_rtd_init(struct snd_soc_pcm_runtime *rtd,
}
snprintf(widget_name, sizeof(widget_name), "%s SPK", prefix);
- ret = asoc_sdw_ti_amp_initial_settings(card, prefix);
- if (ret)
- return ret;
ret = snd_soc_dapm_add_routes(dapm, &route, 1);
if (ret)
--
2.54.0
|