Commit 87689d56 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: Push platform registration down into the card 



As part of the deprecation of snd_soc_device push the registration of
the platform down into the card structure.

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

include/sound/soc.h

+1 −1
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ struct snd_soc_card { 


	struct snd_soc_device *socdev;



	struct snd_soc_platform *platform;

	struct delayed_work delayed_work;

	struct work_struct deferred_resume_work;

};
@@ -360,7 +361,6 @@ struct snd_soc_card { 
struct snd_soc_device {

	struct device *dev;

	struct snd_soc_card *card;

	struct snd_soc_platform *platform;

	struct snd_soc_codec *codec;

	struct snd_soc_codec_device *codec_dev;

	void *codec_data;

sound/soc/atmel/playpaq_wm8510.c

+1 −1
Original line number Diff line number Diff line
@@ -363,6 +363,7 @@ static struct snd_soc_dai_link playpaq_wm8510_dai = { 


static struct snd_soc_card snd_soc_playpaq = {

	.name = "LRS_PlayPaq_WM8510",

	.platform = &at32_soc_platform,

	.dai_link = &playpaq_wm8510_dai,

	.num_links = 1,

};
@@ -378,7 +379,6 @@ static struct wm8510_setup_data playpaq_wm8510_setup = { 


static struct snd_soc_device playpaq_wm8510_snd_devdata = {

	.card = &snd_soc_playpaq,

	.platform = &at32_soc_platform,

	.codec_dev = &soc_codec_dev_wm8510,

	.codec_data = &playpaq_wm8510_setup,

};

sound/soc/atmel/sam9g20_wm8731.c

+1 −1
Original line number Diff line number Diff line
@@ -244,6 +244,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = { 


static struct snd_soc_card snd_soc_at91sam9g20ek = {

	.name = "WM8731",

	.platform = &atmel_soc_platform,

	.dai_link = &at91sam9g20ek_dai,

	.num_links = 1,

};
@@ -255,7 +256,6 @@ static struct wm8731_setup_data at91sam9g20ek_wm8731_setup = { 


static struct snd_soc_device at91sam9g20ek_snd_devdata = {

	.card = &snd_soc_at91sam9g20ek,

	.platform = &atmel_soc_platform,

	.codec_dev = &soc_codec_dev_wm8731,

	.codec_data = &at91sam9g20ek_wm8731_setup,

};

sound/soc/blackfin/bf5xx-ad1980.c

+1 −1
Original line number Diff line number Diff line
@@ -69,13 +69,13 @@ static struct snd_soc_dai_link bf5xx_board_dai = { 


static struct snd_soc_card bf5xx_board = {

	.name = "bf5xx-board",

	.platform = &bf5xx_ac97_soc_platform,

	.dai_link = &bf5xx_board_dai,

	.num_links = 1,

};



static struct snd_soc_device bf5xx_board_snd_devdata = {

	.card = &bf5xx_board,

	.platform = &bf5xx_ac97_soc_platform,

	.codec_dev = &soc_codec_dev_ad1980,

};

sound/soc/blackfin/bf5xx-ad73311.c

+1 −1
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ static struct snd_soc_dai_link bf5xx_ad73311_dai = { 


static struct snd_soc_card bf5xx_ad73311 = {

	.name = "bf5xx_ad73311",

	.platform = &bf5xx_i2s_soc_platform,

	.probe = bf5xx_probe,

	.dai_link = &bf5xx_ad73311_dai,

	.num_links = 1,
@@ -199,7 +200,6 @@ static struct snd_soc_card bf5xx_ad73311 = { 


static struct snd_soc_device bf5xx_ad73311_snd_devdata = {

	.card = &bf5xx_ad73311,

	.platform = &bf5xx_i2s_soc_platform,

	.codec_dev = &soc_codec_dev_ad73311,

};