Unverified Commit 686911b4 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Mark Brown
Browse files

ASoC: simple-card-utils: share asoc_simple_shutdown() 



The difference between simple-card / audio-graph are just using
OF graph style, or not. In other words, other things should be same.
This means, simple-card/audio-graph common functions should be
implemented at simple-card-utils, and its own functions should be
implemented at each files.

Current simple-card / audio-graph have almost same functions.
This patch shares asoc_simple_shutdown() between in these 2 drivers.

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

include/sound/simple_card_utils.h

+1 −1
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ int asoc_simple_card_parse_clk(struct device *dev, 
			       struct asoc_simple_dai *simple_dai,

			       const char *dai_name,

			       struct snd_soc_dai_link_component *dlc);

void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai);

int asoc_simple_startup(struct snd_pcm_substream *substream);

void asoc_simple_shutdown(struct snd_pcm_substream *substream);



#define asoc_simple_card_parse_cpu(node, dai_link,				\

				   list_name, cells_name, is_single_link)	\

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

+1 −12
Original line number Diff line number Diff line
@@ -56,17 +56,6 @@ static const struct snd_soc_dapm_widget graph_dapm_widgets[] = { 
			       SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD),

};



static void graph_shutdown(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props = simple_priv_to_props(priv, rtd->num);



	asoc_simple_card_clk_disable(dai_props->cpu_dai);



	asoc_simple_card_clk_disable(dai_props->codec_dai);

}



static int graph_hw_params(struct snd_pcm_substream *substream,

			   struct snd_pcm_hw_params *params)

{
@@ -100,7 +89,7 @@ err: 


static const struct snd_soc_ops graph_ops = {

	.startup	= asoc_simple_startup,

	.shutdown	= graph_shutdown,

	.shutdown	= asoc_simple_shutdown,

	.hw_params	= graph_hw_params,

};

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

+14 −2
Original line number Diff line number Diff line
@@ -151,12 +151,11 @@ static int asoc_simple_card_clk_enable(struct asoc_simple_dai *dai) 
	return 0;

}



void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai)

static void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai)

{

	if (dai)

		clk_disable_unprepare(dai->clk);

}

EXPORT_SYMBOL_GPL(asoc_simple_card_clk_disable);



int asoc_simple_card_parse_clk(struct device *dev,

			       struct device_node *node,
@@ -224,6 +223,19 @@ int asoc_simple_startup(struct snd_pcm_substream *substream) 
}

EXPORT_SYMBOL_GPL(asoc_simple_startup);



void asoc_simple_shutdown(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props =

		simple_priv_to_props(priv, rtd->num);



	asoc_simple_card_clk_disable(dai_props->cpu_dai);



	asoc_simple_card_clk_disable(dai_props->codec_dai);

}

EXPORT_SYMBOL_GPL(asoc_simple_shutdown);



int asoc_simple_card_parse_dai(struct device_node *node,

				    struct snd_soc_dai_link_component *dlc,

				    struct device_node **dai_of_node,

sound/soc/generic/simple-card.c

+1 −13
Original line number Diff line number Diff line
@@ -26,18 +26,6 @@ struct link_info { 
#define CELL	"#sound-dai-cells"

#define PREFIX	"simple-audio-card,"



static void simple_shutdown(struct snd_pcm_substream *substream)

{

	struct snd_soc_pcm_runtime *rtd = substream->private_data;

	struct asoc_simple_priv *priv = snd_soc_card_get_drvdata(rtd->card);

	struct simple_dai_props *dai_props =

		simple_priv_to_props(priv, rtd->num);



	asoc_simple_card_clk_disable(dai_props->cpu_dai);



	asoc_simple_card_clk_disable(dai_props->codec_dai);

}



static int simple_set_clk_rate(struct asoc_simple_dai *simple_dai,

			       unsigned long rate)

{
@@ -96,7 +84,7 @@ err: 


static const struct snd_soc_ops simple_ops = {

	.startup	= asoc_simple_startup,

	.shutdown	= simple_shutdown,

	.shutdown	= asoc_simple_shutdown,

	.hw_params	= simple_hw_params,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE