From 1cdd90cdde49861a56939d8acf01f1c6d89b9ee2 Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Thu, 2 Apr 2020 16:30:45 -0700 Subject: [PATCH] Revert "SoC: soc-core: export function to find components" This reverts commit b3f1c1d8990a28243c10074739e793d4ef5ef493. Change-Id: I987273692d62416218befd8942d1fdb09e207304 Signed-off-by: Vignesh Kulothungan --- include/sound/soc.h | 5 ----- sound/soc/soc-core.c | 34 ---------------------------------- 2 files changed, 39 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 374c528b36b0..6feb7be7de7f 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1388,11 +1388,6 @@ int snd_soc_register_dai(struct snd_soc_component *component, struct snd_soc_dai *snd_soc_find_dai( const struct snd_soc_dai_link_component *dlc); -#ifdef CONFIG_AUDIO_QGKI -struct snd_soc_component *soc_find_component( - const struct snd_soc_dai_link_component *dlc); -#endif - #include static inline diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 4b1f8b699ccb..4d00173036af 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -763,39 +763,6 @@ static int snd_soc_is_matching_component( return 1; } -#ifdef CONFIG_AUDIO_QGKI -/** - * soc_find_component: find a component from component_list in ASoC core - * - * @dlc: dlc of the component to query. - * - * function to find out if a component is already registered with ASoC core. - * - * Returns component handle for success, else NULL error. - */ -struct snd_soc_component *soc_find_component( - const struct snd_soc_dai_link_component *dlc) -{ - struct snd_soc_component *component; - - lockdep_assert_held(&client_mutex); - - /* - * NOTE - * - * It returns *1st* found component, but some driver - * has few components by same of_node/name - * ex) - * CPU component and generic DMAEngine component - */ - for_each_component(component) - if (snd_soc_is_matching_component(dlc, component)) - return component; - - return NULL; -} -EXPORT_SYMBOL(soc_find_component); -#else static struct snd_soc_component *soc_find_component( const struct snd_soc_dai_link_component *dlc) { @@ -817,7 +784,6 @@ static struct snd_soc_component *soc_find_component( return NULL; } -#endif /** * snd_soc_find_dai - Find a registered DAI