Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b5b042d authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Make snd_soc_dapm_kcontrol_codec() inline 



snd_soc_dapm_kcontrol_codec() is a extremely simple function and inlining it
typically results in less code than necessary for calling the non-inlined
version of the function.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent c517d838

include/sound/soc-dapm.h

+0 −1
Original line number Diff line number Diff line
@@ -440,7 +440,6 @@ void dapm_mark_endpoints_dirty(struct snd_soc_card *card); 
int snd_soc_dapm_dai_get_connected_widgets(struct snd_soc_dai *dai, int stream,

	struct snd_soc_dapm_widget_list **list);



struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol);

struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm(

	struct snd_kcontrol *kcontrol);

include/sound/soc.h

+13 −0
Original line number Diff line number Diff line
@@ -1258,6 +1258,19 @@ static inline struct snd_soc_dapm_context *snd_soc_component_get_dapm( 
	return component->dapm_ptr;

}



/**

 * snd_soc_dapm_kcontrol_codec() - Returns the codec associated to a kcontrol

 * @kcontrol: The kcontrol

 *

 * This function must only be used on DAPM contexts that are known to be part of

 * a CODEC (e.g. in a CODEC driver). Otherwise the behavior is undefined.

 */

static inline struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(

	struct snd_kcontrol *kcontrol)

{

	return snd_soc_dapm_to_codec(snd_soc_dapm_kcontrol_dapm(kcontrol));

}



/* codec IO */

unsigned int snd_soc_read(struct snd_soc_codec *codec, unsigned int reg);

int snd_soc_write(struct snd_soc_codec *codec, unsigned int reg,

sound/soc/soc-dapm.c

+0 −10
Original line number Diff line number Diff line
@@ -473,16 +473,6 @@ struct snd_soc_dapm_context *snd_soc_dapm_kcontrol_dapm( 
}

EXPORT_SYMBOL_GPL(snd_soc_dapm_kcontrol_dapm);



/**

 * snd_soc_dapm_kcontrol_codec() - Returns the codec associated to a kcontrol

 * @kcontrol: The kcontrol

 */

struct snd_soc_codec *snd_soc_dapm_kcontrol_codec(struct snd_kcontrol *kcontrol)

{

	return snd_soc_dapm_to_codec(snd_soc_dapm_kcontrol_dapm(kcontrol));

}

EXPORT_SYMBOL_GPL(snd_soc_dapm_kcontrol_codec);



static void dapm_reset(struct snd_soc_card *card)

{

	struct snd_soc_dapm_widget *w;