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

Unverified Commit f70f18f7 authored Sep 18, 2018 by Kuninori Morimoto Committed by Mark Brown Sep 20, 2018

ASoC: add for_each_card_components() macro



To be more readable code, this patch adds
new for_each_card_components() macro, and replace existing code to it.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

parent bcb1fd1f

include/sound/soc.h

+3 −0

Original line number	Diff line number	Diff line
		@@ -1135,6 +1135,9 @@ struct snd_soc_card {
		#define for_each_card_rtds_safe(card, rtd, _rtd) \
		list_for_each_entry_safe(rtd, _rtd, &(card)->rtd_list, list)

		#define for_each_card_components(card, component) \
		list_for_each_entry(component, &(card)->component_dev_list, card_list)

		/* SoC machine DAI configuration, glues a codec and cpu DAI together */
		struct snd_soc_pcm_runtime {
		struct device *dev;

sound/soc/intel/boards/broadwell.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -223,7 +223,7 @@ static struct snd_soc_dai_link broadwell_rt286_dais[] = {
		static int broadwell_suspend(struct snd_soc_card *card){
		struct snd_soc_component *component;

		list_for_each_entry(component, &card->component_dev_list, card_list) {
		for_each_card_components(card, component) {
		if (!strcmp(component->name, "i2c-INT343A:00")) {

		dev_dbg(component->dev, "disabling jack detect before going to suspend.\n");
		@@ -237,7 +237,7 @@ static int broadwell_suspend(struct snd_soc_card *card){
		static int broadwell_resume(struct snd_soc_card *card){
		struct snd_soc_component *component;

		list_for_each_entry(component, &card->component_dev_list, card_list) {
		for_each_card_components(card, component) {
		if (!strcmp(component->name, "i2c-INT343A:00")) {

		dev_dbg(component->dev, "enabling jack detect for resume.\n");

sound/soc/intel/boards/bytcr_rt5640.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1048,7 +1048,7 @@ static int byt_rt5640_suspend(struct snd_soc_card *card)
		if (!BYT_RT5640_JDSRC(byt_rt5640_quirk))
		return 0;

		list_for_each_entry(component, &card->component_dev_list, card_list) {
		for_each_card_components(card, component) {
		if (!strcmp(component->name, byt_rt5640_codec_name)) {
		dev_dbg(component->dev, "disabling jack detect before suspend\n");
		snd_soc_component_set_jack(component, NULL, NULL);
		@@ -1067,7 +1067,7 @@ static int byt_rt5640_resume(struct snd_soc_card *card)
		if (!BYT_RT5640_JDSRC(byt_rt5640_quirk))
		return 0;

		list_for_each_entry(component, &card->component_dev_list, card_list) {
		for_each_card_components(card, component) {
		if (!strcmp(component->name, byt_rt5640_codec_name)) {
		dev_dbg(component->dev, "re-enabling jack detect after resume\n");
		snd_soc_component_set_jack(component, &priv->jack, NULL);

sound/soc/intel/boards/bytcr_rt5651.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -742,7 +742,7 @@ static int byt_rt5651_suspend(struct snd_soc_card *card)
		if (!BYT_RT5651_JDSRC(byt_rt5651_quirk))
		return 0;

		list_for_each_entry(component, &card->component_dev_list, card_list) {
		for_each_card_components(card, component) {
		if (!strcmp(component->name, byt_rt5651_codec_name)) {
		dev_dbg(component->dev, "disabling jack detect before suspend\n");
		snd_soc_component_set_jack(component, NULL, NULL);
		@@ -761,7 +761,7 @@ static int byt_rt5651_resume(struct snd_soc_card *card)
		if (!BYT_RT5651_JDSRC(byt_rt5651_quirk))
		return 0;

		list_for_each_entry(component, &card->component_dev_list, card_list) {
		for_each_card_components(card, component) {
		if (!strcmp(component->name, byt_rt5651_codec_name)) {
		dev_dbg(component->dev, "re-enabling jack detect after resume\n");
		snd_soc_component_set_jack(component, &priv->jack, NULL);

sound/soc/intel/boards/cht_bsw_rt5672.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -347,7 +347,7 @@ static int cht_suspend_pre(struct snd_soc_card *card)
		struct snd_soc_component *component;
		struct cht_mc_private *ctx = snd_soc_card_get_drvdata(card);

		list_for_each_entry(component, &card->component_dev_list, card_list) {
		for_each_card_components(card, component) {
		if (!strncmp(component->name,
		ctx->codec_name, sizeof(ctx->codec_name))) {

		@@ -364,7 +364,7 @@ static int cht_resume_post(struct snd_soc_card *card)
		struct snd_soc_component *component;
		struct cht_mc_private *ctx = snd_soc_card_get_drvdata(card);

		list_for_each_entry(component, &card->component_dev_list, card_list) {
		for_each_card_components(card, component) {
		if (!strncmp(component->name,
		ctx->codec_name, sizeof(ctx->codec_name))) {