Unverified Commit 2d7395b2 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card-utils: use snd_soc_ret() 



We can use snd_soc_ret() to indicate error message when return.
Let's use it.

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://patch.msgid.link/87a5b12qlg.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a0ef5b4b

include/sound/simple_card_utils.h

+4 −4
Original line number Diff line number Diff line
@@ -142,14 +142,14 @@ int simple_util_parse_daifmt(struct device *dev, 
			     struct device_node *codec,

			     char *prefix,

			     unsigned int *retfmt);

int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np,

int simple_util_parse_tdm_width_map(struct simple_util_priv *priv, struct device_node *np,

				    struct simple_util_dai *dai);



__printf(3, 4)

int simple_util_set_dailink_name(struct device *dev,

int simple_util_set_dailink_name(struct simple_util_priv *priv,

				 struct snd_soc_dai_link *dai_link,

				 const char *fmt, ...);

int simple_util_parse_card_name(struct snd_soc_card *card,

int simple_util_parse_card_name(struct simple_util_priv *priv,

				char *prefix);



int simple_util_parse_clk(struct device *dev,
@@ -201,7 +201,7 @@ void simple_util_remove(struct platform_device *pdev); 


int graph_util_card_probe(struct snd_soc_card *card);

int graph_util_is_ports0(struct device_node *port);

int graph_util_parse_dai(struct device *dev, struct device_node *ep,

int graph_util_parse_dai(struct simple_util_priv *priv, struct device_node *ep,

			 struct snd_soc_dai_link_component *dlc, int *is_single_link);



void graph_util_parse_link_direction(struct device_node *np,

sound/soc/generic/audio-graph-card.c

+3 −3
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static int graph_parse_node(struct simple_util_priv *priv, 
		dai = simple_props_to_dai_codec(dai_props, 0);

	}



	ret = graph_util_parse_dai(dev, ep, dlc, cpu);

	ret = graph_util_parse_dai(priv, ep, dlc, cpu);

	if (ret < 0)

		return ret;
@@ -183,7 +183,7 @@ static int graph_link_init(struct simple_util_priv *priv, 
	if (priv->ops)

		dai_link->ops	= priv->ops;



	return simple_util_set_dailink_name(dev, dai_link, name);

	return simple_util_set_dailink_name(priv, dai_link, name);

}



static int graph_dai_link_of_dpcm(struct simple_util_priv *priv,
@@ -586,7 +586,7 @@ int audio_graph_parse_of(struct simple_util_priv *priv, struct device *dev) 
	if (ret < 0)

		goto err;



	ret = simple_util_parse_card_name(card, NULL);

	ret = simple_util_parse_card_name(priv, NULL);

	if (ret < 0)

		goto err;

sound/soc/generic/audio-graph-card2.c

+7 −7
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ static int __graph_parse_node(struct simple_util_priv *priv, 
		dai = simple_props_to_dai_codec(dai_props, idx);

	}



	ret = graph_util_parse_dai(dev, ep, dlc, &is_single_links);

	ret = graph_util_parse_dai(priv, ep, dlc, &is_single_links);

	if (ret < 0)

		return ret;
@@ -417,7 +417,7 @@ static int __graph_parse_node(struct simple_util_priv *priv, 
	if (ret < 0)

		return ret;



	ret = simple_util_parse_tdm_width_map(dev, ep, dai);

	ret = simple_util_parse_tdm_width_map(priv, ep, dai);

	if (ret < 0)

		return ret;
@@ -443,22 +443,22 @@ static int __graph_parse_node(struct simple_util_priv *priv, 
		case GRAPH_NORMAL:

			/* run is_cpu only. see audio_graph2_link_normal() */

			if (is_cpu)

				simple_util_set_dailink_name(dev, dai_link, "%s%s-%s%s",

				simple_util_set_dailink_name(priv, dai_link, "%s%s-%s%s",

							       cpus->dai_name,   cpu_multi,

							     codecs->dai_name, codec_multi);

			break;

		case GRAPH_DPCM:

			if (is_cpu)

				simple_util_set_dailink_name(dev, dai_link, "fe.%pOFP.%s%s",

				simple_util_set_dailink_name(priv, dai_link, "fe.%pOFP.%s%s",

						cpus->of_node, cpus->dai_name, cpu_multi);

			else

				simple_util_set_dailink_name(dev, dai_link, "be.%pOFP.%s%s",

				simple_util_set_dailink_name(priv, dai_link, "be.%pOFP.%s%s",

						codecs->of_node, codecs->dai_name, codec_multi);

			break;

		case GRAPH_C2C:

			/* run is_cpu only. see audio_graph2_link_c2c() */

			if (is_cpu)

				simple_util_set_dailink_name(dev, dai_link, "c2c.%s%s-%s%s",

				simple_util_set_dailink_name(priv, dai_link, "c2c.%s%s-%s%s",

							     cpus->dai_name,   cpu_multi,

							     codecs->dai_name, codec_multi);

			break;
@@ -1332,7 +1332,7 @@ int audio_graph2_parse_of(struct simple_util_priv *priv, struct device *dev, 
	if (ret < 0)

		goto err;



	ret = simple_util_parse_card_name(card, NULL);

	ret = simple_util_parse_card_name(priv, NULL);

	if (ret < 0)

		goto err;

sound/soc/generic/simple-card-utils.c

+99 −71
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ 
#include <sound/pcm_params.h>

#include <sound/simple_card_utils.h>



#define simple_ret(priv, ret) _simple_ret(priv, __func__, ret)

static inline int _simple_ret(struct simple_util_priv *priv,

			      const char *func, int ret)

{

	return snd_soc_ret(simple_priv_to_dev(priv), ret, "at %s()\n", func);

}



int simple_util_get_sample_fmt(struct simple_util_data *data)

{

	int i;
@@ -133,33 +140,42 @@ int simple_util_parse_daifmt(struct device *dev, 
}

EXPORT_SYMBOL_GPL(simple_util_parse_daifmt);



int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np,

int simple_util_parse_tdm_width_map(struct simple_util_priv *priv, struct device_node *np,

				    struct simple_util_dai *dai)

{

	struct device *dev = simple_priv_to_dev(priv);

	int n, i, ret;

	u32 *p;



	/*

	 * NOTE

	 *

	 * Clang doesn't allow to use "goto end" before calling __free(),

	 * because it bypasses the initialization. Use simple_ret() directly.

	 */



	n = of_property_count_elems_of_size(np, "dai-tdm-slot-width-map", sizeof(u32));

	if (n <= 0)

		return 0;



	if (n % 3) {

		dev_err(dev, "Invalid number of cells for dai-tdm-slot-width-map\n");

		return -EINVAL;

		return simple_ret(priv, -EINVAL); /* see NOTE */

	}



	ret = -ENOMEM;

	dai->tdm_width_map = devm_kcalloc(dev, n, sizeof(*dai->tdm_width_map), GFP_KERNEL);

	if (!dai->tdm_width_map)

		return -ENOMEM;

		return simple_ret(priv, ret); /* see NOTE */



	u32 *array_values __free(kfree) = kcalloc(n, sizeof(*array_values),

						  GFP_KERNEL);

	u32 *array_values __free(kfree) = kcalloc(n, sizeof(*array_values), GFP_KERNEL);

	if (!array_values)

		return -ENOMEM;

		goto end;



	ret = of_property_read_u32_array(np, "dai-tdm-slot-width-map", array_values, n);

	if (ret < 0) {

		dev_err(dev, "Could not read dai-tdm-slot-width-map: %d\n", ret);

		return ret;

		goto end;

	}



	p = array_values;
@@ -170,15 +186,17 @@ int simple_util_parse_tdm_width_map(struct device *dev, struct device_node *np, 
	}



	dai->n_tdm_widths = i;



	return 0;

	ret = 0;

end:

	return simple_ret(priv, ret);

}

EXPORT_SYMBOL_GPL(simple_util_parse_tdm_width_map);



int simple_util_set_dailink_name(struct device *dev,

int simple_util_set_dailink_name(struct simple_util_priv *priv,

				 struct snd_soc_dai_link *dai_link,

				 const char *fmt, ...)

{

	struct device *dev = simple_priv_to_dev(priv);

	va_list ap;

	char *name = NULL;

	int ret = -ENOMEM;
@@ -194,13 +212,14 @@ int simple_util_set_dailink_name(struct device *dev, 
		dai_link->stream_name	= name;

	}



	return ret;

	return simple_ret(priv, ret);

}

EXPORT_SYMBOL_GPL(simple_util_set_dailink_name);



int simple_util_parse_card_name(struct snd_soc_card *card,

int simple_util_parse_card_name(struct simple_util_priv *priv,

				char *prefix)

{

	struct snd_soc_card *card = simple_priv_to_card(priv);

	int ret;



	if (!prefix)
@@ -214,13 +233,13 @@ int simple_util_parse_card_name(struct snd_soc_card *card, 
		snprintf(prop, sizeof(prop), "%sname", prefix);

		ret = snd_soc_of_parse_card_name(card, prop);

		if (ret < 0)

			return ret;

			goto end;

	}



	if (!card->name && card->dai_link)

		card->name = card->dai_link->name;



	return 0;

end:

	return simple_ret(priv, ret);

}

EXPORT_SYMBOL_GPL(simple_util_parse_card_name);
@@ -348,7 +367,8 @@ int simple_util_startup(struct snd_pcm_substream *substream) 
			break;

		simple_clk_disable(dai);

	}

	return ret;



	return simple_ret(priv, ret);

}

EXPORT_SYMBOL_GPL(simple_util_startup);
@@ -379,16 +399,19 @@ void simple_util_shutdown(struct snd_pcm_substream *substream) 
}

EXPORT_SYMBOL_GPL(simple_util_shutdown);



static int simple_set_clk_rate(struct device *dev,

static int simple_set_clk_rate(struct simple_util_priv *priv,

			       struct simple_util_dai *simple_dai,

			       unsigned long rate)

{

	struct device *dev = simple_priv_to_dev(priv);

	int ret = -EINVAL;



	if (!simple_dai)

		return 0;



	if (simple_dai->clk_fixed && rate != simple_dai->sysclk) {

		dev_err(dev, "dai %s invalid clock rate %lu\n", simple_dai->name, rate);

		return -EINVAL;

		goto end;

	}



	if (!simple_dai->clk)
@@ -397,10 +420,13 @@ static int simple_set_clk_rate(struct device *dev, 
	if (clk_get_rate(simple_dai->clk) == rate)

		return 0;



	return clk_set_rate(simple_dai->clk, rate);

	ret = clk_set_rate(simple_dai->clk, rate);

end:

	return simple_ret(priv, ret);

}



static int simple_set_tdm(struct snd_soc_dai *dai,

static int simple_set_tdm(struct simple_util_priv *priv,

			  struct snd_soc_dai *dai,

			  struct simple_util_dai *simple_dai,

			  struct snd_pcm_hw_params *params)

{
@@ -430,12 +456,8 @@ static int simple_set_tdm(struct snd_soc_dai *dai, 
				       simple_dai->rx_slot_mask,

				       slot_count,

				       slot_width);

	if (ret && ret != -ENOTSUPP) {

		dev_err(dai->dev, "simple-card: set_tdm_slot error: %d\n", ret);

		return ret;

	}



	return 0;

	return simple_ret(priv, ret);

}



int simple_util_hw_params(struct snd_pcm_substream *substream,
@@ -457,15 +479,15 @@ int simple_util_hw_params(struct snd_pcm_substream *substream, 
		mclk = params_rate(params) * mclk_fs;



		for_each_prop_dai_codec(props, i, pdai) {

			ret = simple_set_clk_rate(rtd->dev, pdai, mclk);

			ret = simple_set_clk_rate(priv, pdai, mclk);

			if (ret < 0)

				return ret;

				goto end;

		}



		for_each_prop_dai_cpu(props, i, pdai) {

			ret = simple_set_clk_rate(rtd->dev, pdai, mclk);

			ret = simple_set_clk_rate(priv, pdai, mclk);

			if (ret < 0)

				return ret;

				goto end;

		}



		/* Ensure sysclk is set on all components in case any
@@ -476,39 +498,40 @@ int simple_util_hw_params(struct snd_pcm_substream *substream, 
			ret = snd_soc_component_set_sysclk(component, 0, 0,

							   mclk, SND_SOC_CLOCK_IN);

			if (ret && ret != -ENOTSUPP)

				return ret;

				goto end;

		}



		for_each_rtd_codec_dais(rtd, i, sdai) {

			pdai = simple_props_to_dai_codec(props, i);

			ret = snd_soc_dai_set_sysclk(sdai, 0, mclk, pdai->clk_direction);

			if (ret && ret != -ENOTSUPP)

				return ret;

				goto end;

		}



		for_each_rtd_cpu_dais(rtd, i, sdai) {

			pdai = simple_props_to_dai_cpu(props, i);

			ret = snd_soc_dai_set_sysclk(sdai, 0, mclk, pdai->clk_direction);

			if (ret && ret != -ENOTSUPP)

				return ret;

				goto end;

		}

	}



	for_each_prop_dai_codec(props, i, pdai) {

		sdai = snd_soc_rtd_to_codec(rtd, i);

		ret = simple_set_tdm(sdai, pdai, params);

		ret = simple_set_tdm(priv, sdai, pdai, params);

		if (ret < 0)

			return ret;

			goto end;

	}



	for_each_prop_dai_cpu(props, i, pdai) {

		sdai = snd_soc_rtd_to_cpu(rtd, i);

		ret = simple_set_tdm(sdai, pdai, params);

		ret = simple_set_tdm(priv, sdai, pdai, params);

		if (ret < 0)

			return ret;

			goto end;

	}



	return 0;

	ret = 0;

end:

	return simple_ret(priv, ret);

}

EXPORT_SYMBOL_GPL(simple_util_hw_params);
@@ -536,7 +559,8 @@ int simple_util_be_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, 
}

EXPORT_SYMBOL_GPL(simple_util_be_hw_params_fixup);



static int simple_init_dai(struct snd_soc_dai *dai, struct simple_util_dai *simple_dai)

static int simple_init_dai(struct simple_util_priv *priv,

			   struct snd_soc_dai *dai, struct simple_util_dai *simple_dai)

{

	int ret;
@@ -548,7 +572,7 @@ static int simple_init_dai(struct snd_soc_dai *dai, struct simple_util_dai *simp 
					     simple_dai->clk_direction);

		if (ret && ret != -ENOTSUPP) {

			dev_err(dai->dev, "simple-card: set_sysclk error\n");

			return ret;

			goto end;

		}

	}
@@ -560,11 +584,12 @@ static int simple_init_dai(struct snd_soc_dai *dai, struct simple_util_dai *simp 
					       simple_dai->slot_width);

		if (ret && ret != -ENOTSUPP) {

			dev_err(dai->dev, "simple-card: set_tdm_slot error\n");

			return ret;

			goto end;

		}

	}



	return 0;

	ret = 0;

end:

	return simple_ret(priv, ret);

}



static inline int simple_component_is_codec(struct snd_soc_component *component)
@@ -572,7 +597,8 @@ static inline int simple_component_is_codec(struct snd_soc_component *component) 
	return component->driver->endianness;

}



static int simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd,

static int simple_init_for_codec2codec(struct simple_util_priv *priv,

				       struct snd_soc_pcm_runtime *rtd,

				       struct simple_dai_props *dai_props)

{

	struct snd_soc_dai_link *dai_link = rtd->dai_link;
@@ -604,12 +630,13 @@ static int simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, 


	if (ret < 0) {

		dev_err(rtd->dev, "simple-card: no valid dai_link params\n");

		return ret;

		goto end;

	}



	ret = -ENOMEM;

	c2c_params = devm_kzalloc(rtd->dev, sizeof(*c2c_params), GFP_KERNEL);

	if (!c2c_params)

		return -ENOMEM;

		goto end;



	c2c_params->formats		= hw.formats;

	c2c_params->rates		= hw.rates;
@@ -621,7 +648,9 @@ static int simple_init_for_codec2codec(struct snd_soc_pcm_runtime *rtd, 
	dai_link->c2c_params		= c2c_params;

	dai_link->num_c2c_params	= 1;



	return 0;

	ret = 0;

end:

	return simple_ret(priv, ret);

}



int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd)
@@ -632,21 +661,19 @@ int simple_util_dai_init(struct snd_soc_pcm_runtime *rtd) 
	int i, ret;



	for_each_prop_dai_codec(props, i, dai) {

		ret = simple_init_dai(snd_soc_rtd_to_codec(rtd, i), dai);

		ret = simple_init_dai(priv, snd_soc_rtd_to_codec(rtd, i), dai);

		if (ret < 0)

			return ret;

			goto end;

	}

	for_each_prop_dai_cpu(props, i, dai) {

		ret = simple_init_dai(snd_soc_rtd_to_cpu(rtd, i), dai);

		ret = simple_init_dai(priv, snd_soc_rtd_to_cpu(rtd, i), dai);

		if (ret < 0)

			return ret;

			goto end;

	}



	ret = simple_init_for_codec2codec(rtd, props);

	if (ret < 0)

		return ret;



	return 0;

	ret = simple_init_for_codec2codec(priv, rtd, props);

end:

	return simple_ret(priv, ret);

}

EXPORT_SYMBOL_GPL(simple_util_dai_init);
@@ -831,7 +858,7 @@ int simple_util_init_aux_jacks(struct simple_util_priv *priv, char *prefix) 
	priv->aux_jacks = devm_kcalloc(card->dev, num,

				       sizeof(struct snd_soc_jack), GFP_KERNEL);

	if (!priv->aux_jacks)

		return -ENOMEM;

		return simple_ret(priv, -ENOMEM);



	for_each_card_auxs(card, component) {

		char id[128];
@@ -992,13 +1019,11 @@ int graph_util_card_probe(struct snd_soc_card *card) 


	ret = simple_util_init_hp(card, &priv->hp_jack, NULL);

	if (ret < 0)

		return ret;

		goto end;



	ret = simple_util_init_mic(card, &priv->mic_jack, NULL);

	if (ret < 0)

		return ret;



	return 0;

end:

	return simple_ret(priv, ret);

}

EXPORT_SYMBOL_GPL(graph_util_card_probe);
@@ -1074,9 +1099,10 @@ static int graph_get_dai_id(struct device_node *ep) 
	return id;

}



int graph_util_parse_dai(struct device *dev, struct device_node *ep,

int graph_util_parse_dai(struct simple_util_priv *priv, struct device_node *ep,

			 struct snd_soc_dai_link_component *dlc, int *is_single_link)

{

	struct device *dev = simple_priv_to_dev(priv);

	struct of_phandle_args args = {};

	struct snd_soc_dai *dai;

	int ret;
@@ -1092,11 +1118,12 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, 
	args.np = ep;

	dai = snd_soc_get_dai_via_args(&args);

	if (dai) {

		ret = -ENOMEM;

		dlc->of_node  = node;

		dlc->dai_name = snd_soc_dai_name_get(dai);

		dlc->dai_args = snd_soc_copy_dai_args(dev, &args);

		if (!dlc->dai_args)

			return -ENOMEM;

			goto end;



		goto parse_dai_end;

	}
@@ -1127,13 +1154,14 @@ int graph_util_parse_dai(struct device *dev, struct device_node *ep, 
	 */

	ret = snd_soc_get_dlc(&args, dlc);

	if (ret < 0)

		return ret;

		goto end;



parse_dai_end:

	if (is_single_link)

		*is_single_link = of_graph_get_endpoint_count(node) == 1;



	return 0;

	ret = 0;

end:

	return simple_ret(priv, ret);

}

EXPORT_SYMBOL_GPL(graph_util_parse_dai);

sound/soc/generic/simple-card.c

+2 −2
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ static int simple_link_init(struct simple_util_priv *priv, 
	dai_link->init			= simple_util_dai_init;

	dai_link->ops			= &simple_ops;



	ret = simple_util_set_dailink_name(dev, dai_link, name);

	ret = simple_util_set_dailink_name(priv, dai_link, name);

end:

	return simple_ret(priv, ret);

}
@@ -544,7 +544,7 @@ static int simple_parse_of(struct simple_util_priv *priv, struct link_info *li) 
	if (ret < 0)

		goto end;



	ret = simple_util_parse_card_name(card, PREFIX);

	ret = simple_util_parse_card_name(priv, PREFIX);

	if (ret < 0)

		goto end;