|
@@ -2783,8 +2783,7 @@ static struct snd_soc_dai *soc_add_dai(struct snd_soc_component *component,
|
|
|
* parent's name.
|
|
|
*/
|
|
|
static int snd_soc_register_dais(struct snd_soc_component *component,
|
|
|
- struct snd_soc_dai_driver *dai_drv, size_t count,
|
|
|
- bool legacy_dai_naming)
|
|
|
+ struct snd_soc_dai_driver *dai_drv, size_t count)
|
|
|
{
|
|
|
struct device *dev = component->dev;
|
|
|
struct snd_soc_dai *dai;
|
|
@@ -2796,7 +2795,7 @@ static int snd_soc_register_dais(struct snd_soc_component *component,
|
|
|
for (i = 0; i < count; i++) {
|
|
|
|
|
|
dai = soc_add_dai(component, dai_drv + i,
|
|
|
- count == 1 && legacy_dai_naming);
|
|
|
+ count == 1 && !component->driver->non_legacy_dai_naming);
|
|
|
if (dai == NULL) {
|
|
|
ret = -ENOMEM;
|
|
|
goto err;
|
|
@@ -3046,8 +3045,7 @@ int snd_soc_add_component(struct device *dev,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- ret = snd_soc_register_dais(component, dai_drv, num_dai,
|
|
|
- !component_driver->non_legacy_dai_naming);
|
|
|
+ ret = snd_soc_register_dais(component, dai_drv, num_dai);
|
|
|
if (ret < 0) {
|
|
|
dev_err(dev, "ASoC: Failed to register DAIs: %d\n", ret);
|
|
|
goto err_cleanup;
|