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: Mark Brown <broonie@opensource.wolfsonmicro.com>
diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c
index 18e2062..25593fe 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/omap/n810.c
@@ -288,6 +288,7 @@
/* Audio machine driver */
static struct snd_soc_card snd_soc_n810 = {
.name = "N810",
+ .platform = &omap_soc_platform,
.dai_link = &n810_dai,
.num_links = 1,
};
@@ -303,7 +304,6 @@
/* Audio subsystem */
static struct snd_soc_device n810_snd_devdata = {
.card = &snd_soc_n810,
- .platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_aic3x,
.codec_data = &n810_aic33_setup,
};
diff --git a/sound/soc/omap/omap2evm.c b/sound/soc/omap/omap2evm.c
index 7b160f9..0c2322d 100644
--- a/sound/soc/omap/omap2evm.c
+++ b/sound/soc/omap/omap2evm.c
@@ -93,6 +93,7 @@
/* Audio machine driver */
static struct snd_soc_card snd_soc_omap2evm = {
.name = "omap2evm",
+ .platform = &omap_soc_platform,
.dai_link = &omap2evm_dai,
.num_links = 1,
};
@@ -100,7 +101,6 @@
/* Audio subsystem */
static struct snd_soc_device omap2evm_snd_devdata = {
.card = &snd_soc_omap2evm,
- .platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_twl4030,
};
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
index 3ed2546..fd24a4a 100644
--- a/sound/soc/omap/omap3beagle.c
+++ b/sound/soc/omap/omap3beagle.c
@@ -90,6 +90,7 @@
/* Audio machine driver */
static struct snd_soc_card snd_soc_omap3beagle = {
.name = "omap3beagle",
+ .platform = &omap_soc_platform,
.dai_link = &omap3beagle_dai,
.num_links = 1,
};
@@ -97,7 +98,6 @@
/* Audio subsystem */
static struct snd_soc_device omap3beagle_snd_devdata = {
.card = &snd_soc_omap3beagle,
- .platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_twl4030,
};
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/omap/osk5912.c
index 7a8f14d..845bf41 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/omap/osk5912.c
@@ -145,6 +145,7 @@
/* Audio machine driver */
static struct snd_soc_card snd_soc_card_osk = {
.name = "OSK5912",
+ .platform = &omap_soc_platform,
.dai_link = &osk_dai,
.num_links = 1,
};
@@ -152,7 +153,6 @@
/* Audio subsystem */
static struct snd_soc_device osk_snd_devdata = {
.card = &snd_soc_card_osk,
- .platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_tlv320aic23,
};
diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c
index eea0c37..a72dc4e 100644
--- a/sound/soc/omap/overo.c
+++ b/sound/soc/omap/overo.c
@@ -90,6 +90,7 @@
/* Audio machine driver */
static struct snd_soc_card snd_soc_card_overo = {
.name = "overo",
+ .platform = &omap_soc_platform,
.dai_link = &overo_dai,
.num_links = 1,
};
@@ -97,7 +98,6 @@
/* Audio subsystem */
static struct snd_soc_device overo_snd_devdata = {
.card = &snd_soc_card_overo,
- .platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_twl4030,
};
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c
index 85fd160..ad97836 100644
--- a/sound/soc/omap/sdp3430.c
+++ b/sound/soc/omap/sdp3430.c
@@ -93,6 +93,7 @@
/* Audio machine driver */
static struct snd_soc_machine snd_soc_machine_sdp3430 = {
.name = "SDP3430",
+ .platform = &omap_soc_platform,
.dai_link = &sdp3430_dai,
.num_links = 1,
};
@@ -100,7 +101,6 @@
/* Audio subsystem */
static struct snd_soc_device sdp3430_snd_devdata = {
.machine = &snd_soc_machine_sdp3430,
- .platform = &omap_soc_platform,
.codec_dev = &soc_codec_dev_twl4030,
};