Commit bc263214 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: Rename snd_soc_dai_driver struct ac97_control field to bus_control 



Setting the ac97_control field on a CPU DAI tells the ASoC core that this
DAI in addition to audio data also transports control data to the CODEC.
This causes the core to suspend the DAI after the CODEC and resume it before
the CODEC so communication to the CODEC is still possible. This is not
necessarily something that is specific to AC'97 and can be used by other
buses with the same requirement. This patch renames the flag from
ac97_control to bus_control to make this explicit.

While we are at it also change the type from int to bool.

The following semantich patch was used for automatic conversion of the
drivers:
// <smpl>
@@
identifier drv;
@@
struct snd_soc_dai_driver drv = {
-	.ac97_control
+	.bus_control
	=
-	1
+	true
};
// </smpl>

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 4bafcf07

include/sound/soc-dai.h

+2 −1
Original line number Diff line number Diff line
@@ -206,7 +206,6 @@ struct snd_soc_dai_driver { 
	/* DAI description */

	const char *name;

	unsigned int id;

	int ac97_control;

	unsigned int base;



	/* DAI driver callbacks */
@@ -216,6 +215,8 @@ struct snd_soc_dai_driver { 
	int (*resume)(struct snd_soc_dai *dai);

	/* compress dai */

	bool compress_dai;

	/* DAI is also used for the control bus */

	bool bus_control;



	/* ops */

	const struct snd_soc_dai_ops *ops;

sound/soc/au1x/ac97c.c

+1 −1
Original line number Diff line number Diff line
@@ -205,7 +205,7 @@ static int au1xac97c_dai_probe(struct snd_soc_dai *dai) 


static struct snd_soc_dai_driver au1xac97c_dai_driver = {

	.name			= "alchemy-ac97c",

	.ac97_control		= 1,

	.bus_control		= true,

	.probe			= au1xac97c_dai_probe,

	.playback = {

		.rates		= AC97_RATES,

sound/soc/au1x/psc-ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static const struct snd_soc_dai_ops au1xpsc_ac97_dai_ops = { 
};



static const struct snd_soc_dai_driver au1xpsc_ac97_dai_template = {

	.ac97_control		= 1,

	.bus_control		= true,

	.probe			= au1xpsc_ac97_probe,

	.playback = {

		.rates		= AC97_RATES,

sound/soc/blackfin/bf5xx-ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static int bf5xx_ac97_resume(struct snd_soc_dai *dai) 
#endif



static struct snd_soc_dai_driver bfin_ac97_dai = {

	.ac97_control = 1,

	.bus_control = true,

	.suspend = bf5xx_ac97_suspend,

	.resume = bf5xx_ac97_resume,

	.playback = {

sound/soc/cirrus/ep93xx-ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static const struct snd_soc_dai_ops ep93xx_ac97_dai_ops = { 
static struct snd_soc_dai_driver ep93xx_ac97_dai = {

	.name		= "ep93xx-ac97",

	.id		= 0,

	.ac97_control	= 1,

	.bus_control	= true,

	.probe		= ep93xx_ac97_dai_probe,

	.playback	= {

		.stream_name	= "AC97 Playback",

CRA Git | Maintained and supported by SUSTech CRA and CCSE