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

Commit 12ffa6fc authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card: card name can be option 



snd_card.name is now option on DT case.
non-DT case can follow same style,
and it is understandable from platform point of view.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 81985bd6

sound/soc/generic/simple-card.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -287,7 +287,6 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 
		}

		}





		if (!cinfo->name	||

		if (!cinfo->name	||

		    !cinfo->card	||

		    !cinfo->codec_dai.name	||

		    !cinfo->codec_dai.name	||

		    !cinfo->codec	||

		    !cinfo->codec	||

		    !cinfo->platform	||

		    !cinfo->platform	||
@@ -296,7 +295,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 
			return -EINVAL;

			return -EINVAL;

		}

		}





		priv->snd_card.name	= cinfo->card;

		priv->snd_card.name	= (cinfo->card) ? cinfo->card : cinfo->name;

		dai_link->name		= cinfo->name;

		dai_link->name		= cinfo->name;

		dai_link->stream_name	= cinfo->name;

		dai_link->stream_name	= cinfo->name;

		dai_link->platform_name	= cinfo->platform;

		dai_link->platform_name	= cinfo->platform;