Commit 3ba9e10a authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Remove DAI type information 



DAI type information is only ever used within ASoC in order to special
case AC97 and for diagnostic purposes. Since modern CPUs and codecs
support multi function DAIs which can be configured for several modes
it is more trouble than it's worth to maintain anything other than a
flag identifying AC97 DAIs so remove the type field and replace it with
an ac97_control flag.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent b0bd53a7

include/sound/soc-dai.h

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ struct snd_soc_dai { 
	/* DAI description */

	char *name;

	unsigned int id;

	unsigned char type;

	int ac97_control;



	/* DAI callbacks */

	int (*probe)(struct platform_device *pdev,

include/sound/soc.h

+0 −8
Original line number Diff line number Diff line
@@ -143,14 +143,6 @@ enum snd_soc_bias_level { 
	SND_SOC_BIAS_OFF,

};



/*

 * Digital Audio Interface (DAI) types

 */

#define SND_SOC_DAI_AC97	0x1

#define SND_SOC_DAI_I2S		0x2

#define SND_SOC_DAI_PCM		0x4

#define SND_SOC_DAI_AC97_BUS	0x8	/* for custom i.e. non ac97_codec.c */



struct snd_soc_device;

struct snd_soc_pcm_stream;

struct snd_soc_ops;

sound/soc/atmel/atmel_ssc_dai.c

+0 −3
Original line number Diff line number Diff line
@@ -702,7 +702,6 @@ static int atmel_ssc_resume(struct platform_device *pdev, 
struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = {

	{	.name = "atmel-ssc0",

		.id = 0,

		.type = SND_SOC_DAI_PCM,

		.suspend = atmel_ssc_suspend,

		.resume = atmel_ssc_resume,

		.playback = {
@@ -727,7 +726,6 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = { 
#if NUM_SSC_DEVICES == 3

	{	.name = "atmel-ssc1",

		.id = 1,

		.type = SND_SOC_DAI_PCM,

		.suspend = atmel_ssc_suspend,

		.resume = atmel_ssc_resume,

		.playback = {
@@ -751,7 +749,6 @@ struct snd_soc_dai atmel_ssc_dai[NUM_SSC_DEVICES] = { 
	},

	{	.name = "atmel-ssc2",

		.id = 2,

		.type = SND_SOC_DAI_PCM,

		.suspend = atmel_ssc_suspend,

		.resume = atmel_ssc_resume,

		.playback = {

sound/soc/au1x/psc-ac97.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int au1xpsc_ac97_resume(struct platform_device *pdev, 


struct snd_soc_dai au1xpsc_ac97_dai = {

	.name			= "au1xpsc_ac97",

	.type			= SND_SOC_DAI_AC97,

	.ac97_control		= 1,

	.probe			= au1xpsc_ac97_probe,

	.remove			= au1xpsc_ac97_remove,

	.suspend		= au1xpsc_ac97_suspend,

sound/soc/au1x/psc-i2s.c

+0 −1
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ static int au1xpsc_i2s_resume(struct platform_device *pdev, 


struct snd_soc_dai au1xpsc_i2s_dai = {

	.name			= "au1xpsc_i2s",

	.type			= SND_SOC_DAI_I2S,

	.probe			= au1xpsc_i2s_probe,

	.remove			= au1xpsc_i2s_remove,

	.suspend		= au1xpsc_i2s_suspend,

CRA Git | Maintained and supported by SUSTech CRA and CCSE