From: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
No driver is using snd_soc_of_parse_daifmt().
This patch removes it.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
---
include/sound/soc.h | 4 --
sound/soc/soc-core.c | 104 -------------------------------------------
2 files changed, 108 deletions(-)
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 63194a8773cd..675849d07284 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1249,10 +1249,6 @@ unsigned int snd_soc_daifmt_parse_clock_provider_raw(struct device_node *np,
snd_soc_daifmt_clock_provider_from_bitmap( \
snd_soc_daifmt_parse_clock_provider_as_bitmap(np, prefix))
-unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
- const char *prefix,
- struct device_node **bitclkmaster,
- struct device_node **framemaster);
int snd_soc_get_dai_id(struct device_node *ep);
int snd_soc_get_dai_name(const struct of_phandle_args *args,
const char **dai_name);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b6790d2a0447..70361e8da258 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3159,110 +3159,6 @@ unsigned int snd_soc_daifmt_parse_clock_provider_raw(struct device_node *np,
}
EXPORT_SYMBOL_GPL(snd_soc_daifmt_parse_clock_provider_raw);
-unsigned int snd_soc_of_parse_daifmt(struct device_node *np,
- const char *prefix,
- struct device_node **bitclkmaster,
- struct device_node **framemaster)
-{
- int ret, i;
- char prop[128];
- unsigned int format = 0;
- int bit, frame;
- const char *str;
- struct {
- char *name;
- unsigned int val;
- } of_fmt_table[] = {
- { "i2s", SND_SOC_DAIFMT_I2S },
- { "right_j", SND_SOC_DAIFMT_RIGHT_J },
- { "left_j", SND_SOC_DAIFMT_LEFT_J },
- { "dsp_a", SND_SOC_DAIFMT_DSP_A },
- { "dsp_b", SND_SOC_DAIFMT_DSP_B },
- { "ac97", SND_SOC_DAIFMT_AC97 },
- { "pdm", SND_SOC_DAIFMT_PDM},
- { "msb", SND_SOC_DAIFMT_MSB },
- { "lsb", SND_SOC_DAIFMT_LSB },
- };
-
- if (!prefix)
- prefix = "";
-
- /*
- * check "dai-format = xxx"
- * or "[prefix]format = xxx"
- * SND_SOC_DAIFMT_FORMAT_MASK area
- */
- ret = of_property_read_string(np, "dai-format", &str);
- if (ret < 0) {
- snprintf(prop, sizeof(prop), "%sformat", prefix);
- ret = of_property_read_string(np, prop, &str);
- }
- if (ret == 0) {
- for (i = 0; i < ARRAY_SIZE(of_fmt_table); i++) {
- if (strcmp(str, of_fmt_table[i].name) == 0) {
- format |= of_fmt_table[i].val;
- break;
- }
- }
- }
-
- /*
- * check "[prefix]continuous-clock"
- * SND_SOC_DAIFMT_CLOCK_MASK area
- */
- snprintf(prop, sizeof(prop), "%scontinuous-clock", prefix);
- if (of_property_read_bool(np, prop))
- format |= SND_SOC_DAIFMT_CONT;
- else
- format |= SND_SOC_DAIFMT_GATED;
-
- /*
- * check "[prefix]bitclock-inversion"
- * check "[prefix]frame-inversion"
- * SND_SOC_DAIFMT_INV_MASK area
- */
- snprintf(prop, sizeof(prop), "%sbitclock-inversion", prefix);
- bit = !!of_get_property(np, prop, NULL);
-
- snprintf(prop, sizeof(prop), "%sframe-inversion", prefix);
- frame = !!of_get_property(np, prop, NULL);
-
- switch ((bit << 4) + frame) {
- case 0x11:
- format |= SND_SOC_DAIFMT_IB_IF;
- break;
- case 0x10:
- format |= SND_SOC_DAIFMT_IB_NF;
- break;
- case 0x01:
- format |= SND_SOC_DAIFMT_NB_IF;
- break;
- default:
- /* SND_SOC_DAIFMT_NB_NF is default */
- break;
- }
-
- /*
- * check "[prefix]bitclock-master"
- * check "[prefix]frame-master"
- * SND_SOC_DAIFMT_MASTER_MASK area
- */
- snprintf(prop, sizeof(prop), "%sbitclock-master", prefix);
- bit = !!of_get_property(np, prop, NULL);
- if (bit && bitclkmaster)
- *bitclkmaster = of_parse_phandle(np, prop, 0);
-
- snprintf(prop, sizeof(prop), "%sframe-master", prefix);
- frame = !!of_get_property(np, prop, NULL);
- if (frame && framemaster)
- *framemaster = of_parse_phandle(np, prop, 0);
-
- format |= snd_soc_daifmt_clock_provider_from_bitmap((bit << 4) + frame);
-
- return format;
-}
-EXPORT_SYMBOL_GPL(snd_soc_of_parse_daifmt);
-
int snd_soc_get_dai_id(struct device_node *ep)
{
struct snd_soc_component *component;
--
2.25.1
