Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c3b19c8d authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card: remove asoc_simple_card_sub_parse_of() 



asoc_simple_card_sub_parse_of() is no longer needed. Let's cleanup

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5bbf3866

sound/soc/generic/simple-card.c

+8 −38
Original line number Original line Diff line number Diff line
@@ -238,31 +238,6 @@ static int asoc_simple_card_dai_init(struct snd_soc_pcm_runtime *rtd) 
	return 0;

	return 0;

}

}





static int

asoc_simple_card_sub_parse_of(struct device_node *np,

			      struct asoc_simple_dai *dai,

			      struct device_node **p_node,

			      const char **name,

			      int *args_count)

{

	int ret;



	if (!np)

		return 0;



	if (!dai)

		return 0;



	/* Parse TDM slot */

	ret = snd_soc_of_parse_tdm_slot(np, &dai->tx_slot_mask,

					&dai->rx_slot_mask,

					&dai->slots, &dai->slot_width);

	if (ret)

		return ret;



	return 0;

}



static int asoc_simple_card_dai_link_of(struct device_node *node,

static int asoc_simple_card_dai_link_of(struct device_node *node,

					struct simple_card_data *priv,

					struct simple_card_data *priv,

					int idx,

					int idx,
@@ -321,22 +296,17 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, 
	if (ret < 0)

	if (ret < 0)

		goto dai_link_of_err;

		goto dai_link_of_err;





	ret = asoc_simple_card_sub_parse_of(cpu, &dai_props->cpu_dai,

	ret = snd_soc_of_parse_tdm_slot(cpu,	&cpu_dai->tx_slot_mask,

					    &dai_link->cpu_of_node,

						&cpu_dai->rx_slot_mask,

					    &dai_link->cpu_dai_name,

						&cpu_dai->slots,

					    &single_cpu);

						&cpu_dai->slot_width);

	if (ret < 0)

		goto dai_link_of_err;



	ret = asoc_simple_card_sub_parse_of(codec, &dai_props->codec_dai,

					    &dai_link->codec_of_node,

					    &dai_link->codec_dai_name, NULL);

	if (ret < 0)

	if (ret < 0)

		goto dai_link_of_err;

		goto dai_link_of_err;





	ret = asoc_simple_card_sub_parse_of(plat, NULL,

	ret = snd_soc_of_parse_tdm_slot(codec,	&codec_dai->tx_slot_mask,

					    &dai_link->platform_of_node,

						&codec_dai->rx_slot_mask,

					    NULL, NULL);

						&codec_dai->slots,

						&codec_dai->slot_width);

	if (ret < 0)

	if (ret < 0)

		goto dai_link_of_err;

		goto dai_link_of_err;