Unverified Commit 9c0e29b9 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: remove disable_route_checks 

Merge series from Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>:

ASoC framwork has disable_route_checks flag. Intel is the last user of it,
but it seems it exists in dead code. So we can remove it.
parents fd688ce1 dd239516

include/sound/soc.h

+0 −1
Original line number Diff line number Diff line
@@ -1118,7 +1118,6 @@ struct snd_soc_card { 
	unsigned int instantiated:1;

	unsigned int topology_shortname_created:1;

	unsigned int fully_routed:1;

	unsigned int disable_route_checks:1;

	unsigned int probed:1;

	unsigned int component_chaining:1;

sound/soc/intel/boards/skl_hda_dsp_generic.c

+0 −2
Original line number Diff line number Diff line
@@ -124,8 +124,6 @@ static int skl_hda_audio_probe(struct platform_device *pdev) 
		return ret;



	card->dev = &pdev->dev;

	if (!snd_soc_acpi_sof_parent(&pdev->dev))

		card->disable_route_checks = true;



	if (mach->mach_params.dmic_num > 0) {

		card->components = devm_kasprintf(card->dev, GFP_KERNEL,

sound/soc/soc-core.c

+4 −25
Original line number Diff line number Diff line
@@ -1644,19 +1644,8 @@ static int soc_probe_component(struct snd_soc_card *card, 
	ret = snd_soc_dapm_add_routes(dapm,

				      component->driver->dapm_routes,

				      component->driver->num_dapm_routes);

	if (ret < 0) {

		if (card->disable_route_checks) {

			ret = 0;

			dev_info(card->dev,

				 "%s: disable_route_checks set, ignoring errors on add_routes\n",

				 __func__);

		} else {

			dev_err(card->dev,

				"%s: snd_soc_dapm_add_routes failed: %d\n",

				__func__, ret);

	if (ret < 0)

		goto err_probe;

		}

	}



	/* see for_each_card_components */

	list_add(&component->card_list, &card->component_dev_list);
@@ -2235,18 +2224,8 @@ static int snd_soc_bind_card(struct snd_soc_card *card) 


	ret = snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes,

				      card->num_dapm_routes);

	if (ret < 0) {

		if (card->disable_route_checks) {

			dev_info(card->dev,

				 "%s: disable_route_checks set, ignoring errors on add_routes\n",

				 __func__);

		} else {

			dev_err(card->dev,

				 "%s: snd_soc_dapm_add_routes failed: %d\n",

				 __func__, ret);

	if (ret < 0)

		goto probe_end;

		}

	}



	ret = snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,

				      card->num_of_dapm_routes);

sound/soc/soc-topology.c

+2 −10
Original line number Diff line number Diff line
@@ -1101,17 +1101,9 @@ static int soc_tplg_dapm_graph_elems_load(struct soc_tplg *tplg, 
		}



		ret = snd_soc_dapm_add_routes(dapm, route, 1);

		if (ret) {

			if (dapm->card->disable_route_checks) {

				ret = 0;

				dev_info(tplg->dev,

					 "ASoC: disable_route_checks set, ignoring dapm_add_routes errors\n");

			} else {

				dev_err(tplg->dev, "ASoC: dapm_add_routes failed: %d\n", ret);

		if (ret)

			break;

	}

		}

	}



	return ret;

}