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

Commit 5be50957 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card: add new simple_priv_to_card() macro 



Current simple card driver is directly calling priv->snd_card
everywhere, but it makes unreadable code.
Let's use simple_priv_to_card() macro for it

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 40b68dac

sound/soc/generic/simple-card.c

+23 −18
Original line number Original line Diff line number Diff line
@@ -40,9 +40,10 @@ struct simple_card_data { 
	struct snd_soc_dai_link *dai_link;

	struct snd_soc_dai_link *dai_link;

};

};





#define simple_priv_to_dev(priv) ((priv)->snd_card.dev)

#define simple_priv_to_card(priv) (&(priv)->snd_card)

#define simple_priv_to_link(priv, i) ((priv)->snd_card.dai_link + (i))

#define simple_priv_to_props(priv, i) ((priv)->dai_props + (i))

#define simple_priv_to_props(priv, i) ((priv)->dai_props + (i))

#define simple_priv_to_dev(priv) (simple_priv_to_card(priv)->dev)

#define simple_priv_to_link(priv, i) (simple_priv_to_card(priv)->dai_link + (i))





#define DAI	"sound-dai"

#define DAI	"sound-dai"

#define CELL	"#sound-dai-cells"

#define CELL	"#sound-dai-cells"
@@ -323,6 +324,7 @@ static int asoc_simple_card_parse_aux_devs(struct device_node *node, 
{

{

	struct device *dev = simple_priv_to_dev(priv);

	struct device *dev = simple_priv_to_dev(priv);

	struct device_node *aux_node;

	struct device_node *aux_node;

	struct snd_soc_card *card = simple_priv_to_card(priv);

	int i, n, len;

	int i, n, len;





	if (!of_find_property(node, PREFIX "aux-devs", &len))

	if (!of_find_property(node, PREFIX "aux-devs", &len))
@@ -332,19 +334,19 @@ static int asoc_simple_card_parse_aux_devs(struct device_node *node, 
	if (n <= 0)

	if (n <= 0)

		return -EINVAL;

		return -EINVAL;





	priv->snd_card.aux_dev = devm_kzalloc(dev,

	card->aux_dev = devm_kzalloc(dev,

			n * sizeof(*priv->snd_card.aux_dev), GFP_KERNEL);

			n * sizeof(*card->aux_dev), GFP_KERNEL);

	if (!priv->snd_card.aux_dev)

	if (!card->aux_dev)

		return -ENOMEM;

		return -ENOMEM;





	for (i = 0; i < n; i++) {

	for (i = 0; i < n; i++) {

		aux_node = of_parse_phandle(node, PREFIX "aux-devs", i);

		aux_node = of_parse_phandle(node, PREFIX "aux-devs", i);

		if (!aux_node)

		if (!aux_node)

			return -EINVAL;

			return -EINVAL;

		priv->snd_card.aux_dev[i].codec_of_node = aux_node;

		card->aux_dev[i].codec_of_node = aux_node;

	}

	}





	priv->snd_card.num_aux_devs = n;

	card->num_aux_devs = n;

	return 0;

	return 0;

}

}
@@ -352,6 +354,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, 
				     struct simple_card_data *priv)

				     struct simple_card_data *priv)

{

{

	struct device *dev = simple_priv_to_dev(priv);

	struct device *dev = simple_priv_to_dev(priv);

	struct snd_soc_card *card = simple_priv_to_card(priv);

	struct device_node *dai_link;

	struct device_node *dai_link;

	int ret;

	int ret;
@@ -362,7 +365,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, 




	/* The off-codec widgets */

	/* The off-codec widgets */

	if (of_property_read_bool(node, PREFIX "widgets")) {

	if (of_property_read_bool(node, PREFIX "widgets")) {

		ret = snd_soc_of_parse_audio_simple_widgets(&priv->snd_card,

		ret = snd_soc_of_parse_audio_simple_widgets(card,

					PREFIX "widgets");

					PREFIX "widgets");

		if (ret)

		if (ret)

			goto card_parse_end;

			goto card_parse_end;
@@ -370,7 +373,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, 




	/* DAPM routes */

	/* DAPM routes */

	if (of_property_read_bool(node, PREFIX "routing")) {

	if (of_property_read_bool(node, PREFIX "routing")) {

		ret = snd_soc_of_parse_audio_routing(&priv->snd_card,

		ret = snd_soc_of_parse_audio_routing(card,

					PREFIX "routing");

					PREFIX "routing");

		if (ret)

		if (ret)

			goto card_parse_end;

			goto card_parse_end;
@@ -401,7 +404,7 @@ static int asoc_simple_card_parse_of(struct device_node *node, 
			goto card_parse_end;

			goto card_parse_end;

	}

	}





	ret = asoc_simple_card_parse_card_name(&priv->snd_card, PREFIX);

	ret = asoc_simple_card_parse_card_name(card, PREFIX);

	if (ret < 0)

	if (ret < 0)

		goto card_parse_end;

		goto card_parse_end;
@@ -420,6 +423,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 
	struct simple_dai_props *dai_props;

	struct simple_dai_props *dai_props;

	struct device *dev = &pdev->dev;

	struct device *dev = &pdev->dev;

	struct device_node *np = dev->of_node;

	struct device_node *np = dev->of_node;

	struct snd_soc_card *card;

	int num, ret;

	int num, ret;





	/* Get the number of DAI links */

	/* Get the number of DAI links */
@@ -442,10 +446,11 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 
	priv->dai_link			= dai_link;

	priv->dai_link			= dai_link;





	/* Init snd_soc_card */

	/* Init snd_soc_card */

	priv->snd_card.owner		= THIS_MODULE;

	card = simple_priv_to_card(priv);

	priv->snd_card.dev		= dev;

	card->owner		= THIS_MODULE;

	priv->snd_card.dai_link		= priv->dai_link;

	card->dev		= dev;

	priv->snd_card.num_links	= num;

	card->dai_link		= priv->dai_link;

	card->num_links		= num;





	if (np && of_device_is_available(np)) {

	if (np && of_device_is_available(np)) {
@@ -474,7 +479,7 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 
			return -EINVAL;

			return -EINVAL;

		}

		}





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

		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;
@@ -489,13 +494,13 @@ static int asoc_simple_card_probe(struct platform_device *pdev) 
					sizeof(priv->dai_props->codec_dai));

					sizeof(priv->dai_props->codec_dai));

	}

	}





	snd_soc_card_set_drvdata(&priv->snd_card, priv);

	snd_soc_card_set_drvdata(card, priv);





	ret = devm_snd_soc_register_card(dev, &priv->snd_card);

	ret = devm_snd_soc_register_card(dev, card);

	if (ret >= 0)

	if (ret >= 0)

		return ret;

		return ret;

err:

err:

	asoc_simple_card_clean_reference(&priv->snd_card);

	asoc_simple_card_clean_reference(card);





	return ret;

	return ret;

}

}