tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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.

Mark Brown 9c0e29b9 fd688ce1

+6 -38
-1
include/sound/soc.h
··· 1118 1118 unsigned int instantiated:1; 1119 1119 unsigned int topology_shortname_created:1; 1120 1120 unsigned int fully_routed:1; 1121 - unsigned int disable_route_checks:1; 1122 1121 unsigned int probed:1; 1123 1122 unsigned int component_chaining:1; 1124 1123
-2
sound/soc/intel/boards/skl_hda_dsp_generic.c
··· 124 124 return ret; 125 125 126 126 card->dev = &pdev->dev; 127 - if (!snd_soc_acpi_sof_parent(&pdev->dev)) 128 - card->disable_route_checks = true; 129 127 130 128 if (mach->mach_params.dmic_num > 0) { 131 129 card->components = devm_kasprintf(card->dev, GFP_KERNEL,
+4 -25
sound/soc/soc-core.c
··· 1644 1644 ret = snd_soc_dapm_add_routes(dapm, 1645 1645 component->driver->dapm_routes, 1646 1646 component->driver->num_dapm_routes); 1647 - if (ret < 0) { 1648 - if (card->disable_route_checks) { 1649 - ret = 0; 1650 - dev_info(card->dev, 1651 - "%s: disable_route_checks set, ignoring errors on add_routes\n", 1652 - __func__); 1653 - } else { 1654 - dev_err(card->dev, 1655 - "%s: snd_soc_dapm_add_routes failed: %d\n", 1656 - __func__, ret); 1657 - goto err_probe; 1658 - } 1659 - } 1647 + if (ret < 0) 1648 + goto err_probe; 1660 1649 1661 1650 /* see for_each_card_components */ 1662 1651 list_add(&component->card_list, &card->component_dev_list); ··· 2224 2235 2225 2236 ret = snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes, 2226 2237 card->num_dapm_routes); 2227 - if (ret < 0) { 2228 - if (card->disable_route_checks) { 2229 - dev_info(card->dev, 2230 - "%s: disable_route_checks set, ignoring errors on add_routes\n", 2231 - __func__); 2232 - } else { 2233 - dev_err(card->dev, 2234 - "%s: snd_soc_dapm_add_routes failed: %d\n", 2235 - __func__, ret); 2236 - goto probe_end; 2237 - } 2238 - } 2238 + if (ret < 0) 2239 + goto probe_end; 2239 2240 2240 2241 ret = snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes, 2241 2242 card->num_of_dapm_routes);
+2 -10
sound/soc/soc-topology.c
··· 1101 1101 } 1102 1102 1103 1103 ret = snd_soc_dapm_add_routes(dapm, route, 1); 1104 - if (ret) { 1105 - if (dapm->card->disable_route_checks) { 1106 - ret = 0; 1107 - dev_info(tplg->dev, 1108 - "ASoC: disable_route_checks set, ignoring dapm_add_routes errors\n"); 1109 - } else { 1110 - dev_err(tplg->dev, "ASoC: dapm_add_routes failed: %d\n", ret); 1111 - break; 1112 - } 1113 - } 1104 + if (ret) 1105 + break; 1114 1106 } 1115 1107 1116 1108 return ret;