[alsa-devel] [PATCH 09/28] ASoC: soc-core: don't check routes for snd_soc_dapm_add_routes()

[Kuninori Morimoto]

From: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>

snd_soc_dapm_add_routes() registers routes by using
for(... i < num; ...). If routes was NULL, num should be zero.
Thus, we don't need to check about route pointer.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx at renesas.com>
---
 sound/soc/soc-core.c | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 7be8385..5b26a59 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -1307,10 +1307,9 @@ static int soc_probe_component(struct snd_soc_card *card,
 	snd_soc_add_component_controls(component,
 				       component->driver->controls,
 				       component->driver->num_controls);
-	if (component->driver->dapm_routes)
-		snd_soc_dapm_add_routes(dapm,
-					component->driver->dapm_routes,
-					component->driver->num_dapm_routes);
+	snd_soc_dapm_add_routes(dapm,
+				component->driver->dapm_routes,
+				component->driver->num_dapm_routes);
 
 	list_add(&dapm->list, &card->dapm_list);
 	/* see for_each_card_components */
@@ -2053,13 +2052,11 @@ static int snd_soc_instantiate_card(struct snd_soc_card *card)
 		snd_soc_add_card_controls(card, card->controls,
 					  card->num_controls);
 
-	if (card->dapm_routes)
-		snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes,
-					card->num_dapm_routes);
+	snd_soc_dapm_add_routes(&card->dapm, card->dapm_routes,
+				card->num_dapm_routes);
 
-	if (card->of_dapm_routes)
-		snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,
-					card->num_of_dapm_routes);
+	snd_soc_dapm_add_routes(&card->dapm, card->of_dapm_routes,
+				card->num_of_dapm_routes);
 
 	/* try to set some sane longname if DMI is available */
 	snd_soc_set_dmi_name(card, NULL);
-- 
2.7.4