diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-02 11:01:14 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-02 11:03:40 -0500 |
commit | 87689d567a45f80416feea0a2aa6d3a2a6b8963a (patch) | |
tree | d33d923e9e359f3be124d0a63c30b41637b9f933 /sound/soc/s3c24xx | |
parent | 6308419a199eed66086cd756ab8dc81b88d54a6b (diff) |
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>
Diffstat (limited to 'sound/soc/s3c24xx')
-rw-r--r-- | sound/soc/s3c24xx/ln2440sbc_alc650.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/neo1973_wm8753.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx_uda134x.c | 2 | ||||
-rw-r--r-- | sound/soc/s3c24xx/smdk2443_wm9710.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/s3c24xx/ln2440sbc_alc650.c b/sound/soc/s3c24xx/ln2440sbc_alc650.c index a70cbc0fa07..12c71482d25 100644 --- a/sound/soc/s3c24xx/ln2440sbc_alc650.c +++ b/sound/soc/s3c24xx/ln2440sbc_alc650.c | |||
@@ -40,13 +40,13 @@ static struct snd_soc_dai_link ln2440sbc_dai[] = { | |||
40 | 40 | ||
41 | static struct snd_soc_card ln2440sbc = { | 41 | static struct snd_soc_card ln2440sbc = { |
42 | .name = "LN2440SBC", | 42 | .name = "LN2440SBC", |
43 | .platform = &s3c24xx_soc_platform, | ||
43 | .dai_link = ln2440sbc_dai, | 44 | .dai_link = ln2440sbc_dai, |
44 | .num_links = ARRAY_SIZE(ln2440sbc_dai), | 45 | .num_links = ARRAY_SIZE(ln2440sbc_dai), |
45 | }; | 46 | }; |
46 | 47 | ||
47 | static struct snd_soc_device ln2440sbc_snd_ac97_devdata = { | 48 | static struct snd_soc_device ln2440sbc_snd_ac97_devdata = { |
48 | .card = &ln2440sbc, | 49 | .card = &ln2440sbc, |
49 | .platform = &s3c24xx_soc_platform, | ||
50 | .codec_dev = &soc_codec_dev_ac97, | 50 | .codec_dev = &soc_codec_dev_ac97, |
51 | }; | 51 | }; |
52 | 52 | ||
diff --git a/sound/soc/s3c24xx/neo1973_wm8753.c b/sound/soc/s3c24xx/neo1973_wm8753.c index 3df2224a672..45bb12e8ea4 100644 --- a/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/sound/soc/s3c24xx/neo1973_wm8753.c | |||
@@ -580,6 +580,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { | |||
580 | 580 | ||
581 | static struct snd_soc_card neo1973 = { | 581 | static struct snd_soc_card neo1973 = { |
582 | .name = "neo1973", | 582 | .name = "neo1973", |
583 | .platform = &s3c24xx_soc_platform, | ||
583 | .dai_link = neo1973_dai, | 584 | .dai_link = neo1973_dai, |
584 | .num_links = ARRAY_SIZE(neo1973_dai), | 585 | .num_links = ARRAY_SIZE(neo1973_dai), |
585 | }; | 586 | }; |
@@ -591,7 +592,6 @@ static struct wm8753_setup_data neo1973_wm8753_setup = { | |||
591 | 592 | ||
592 | static struct snd_soc_device neo1973_snd_devdata = { | 593 | static struct snd_soc_device neo1973_snd_devdata = { |
593 | .card = &neo1973, | 594 | .card = &neo1973, |
594 | .platform = &s3c24xx_soc_platform, | ||
595 | .codec_dev = &soc_codec_dev_wm8753, | 595 | .codec_dev = &soc_codec_dev_wm8753, |
596 | .codec_data = &neo1973_wm8753_setup, | 596 | .codec_data = &neo1973_wm8753_setup, |
597 | }; | 597 | }; |
diff --git a/sound/soc/s3c24xx/s3c24xx_uda134x.c b/sound/soc/s3c24xx/s3c24xx_uda134x.c index 23325fca1f6..a0a4d1832a1 100644 --- a/sound/soc/s3c24xx/s3c24xx_uda134x.c +++ b/sound/soc/s3c24xx/s3c24xx_uda134x.c | |||
@@ -234,6 +234,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { | |||
234 | 234 | ||
235 | static struct snd_soc_card snd_soc_s3c24xx_uda134x = { | 235 | static struct snd_soc_card snd_soc_s3c24xx_uda134x = { |
236 | .name = "S3C24XX_UDA134X", | 236 | .name = "S3C24XX_UDA134X", |
237 | .platform = &s3c24xx_soc_platform, | ||
237 | .dai_link = &s3c24xx_uda134x_dai_link, | 238 | .dai_link = &s3c24xx_uda134x_dai_link, |
238 | .num_links = 1, | 239 | .num_links = 1, |
239 | }; | 240 | }; |
@@ -271,7 +272,6 @@ static struct uda134x_platform_data s3c24xx_uda134x = { | |||
271 | 272 | ||
272 | static struct snd_soc_device s3c24xx_uda134x_snd_devdata = { | 273 | static struct snd_soc_device s3c24xx_uda134x_snd_devdata = { |
273 | .card = &snd_soc_s3c24xx_uda134x, | 274 | .card = &snd_soc_s3c24xx_uda134x, |
274 | .platform = &s3c24xx_soc_platform, | ||
275 | .codec_dev = &soc_codec_dev_uda134x, | 275 | .codec_dev = &soc_codec_dev_uda134x, |
276 | .codec_data = &s3c24xx_uda134x, | 276 | .codec_data = &s3c24xx_uda134x, |
277 | }; | 277 | }; |
diff --git a/sound/soc/s3c24xx/smdk2443_wm9710.c b/sound/soc/s3c24xx/smdk2443_wm9710.c index 3d2e6a0417e..a2a4f5323c1 100644 --- a/sound/soc/s3c24xx/smdk2443_wm9710.c +++ b/sound/soc/s3c24xx/smdk2443_wm9710.c | |||
@@ -36,13 +36,13 @@ static struct snd_soc_dai_link smdk2443_dai[] = { | |||
36 | 36 | ||
37 | static struct snd_soc_card smdk2443 = { | 37 | static struct snd_soc_card smdk2443 = { |
38 | .name = "SMDK2443", | 38 | .name = "SMDK2443", |
39 | .platform = &s3c24xx_soc_platform, | ||
39 | .dai_link = smdk2443_dai, | 40 | .dai_link = smdk2443_dai, |
40 | .num_links = ARRAY_SIZE(smdk2443_dai), | 41 | .num_links = ARRAY_SIZE(smdk2443_dai), |
41 | }; | 42 | }; |
42 | 43 | ||
43 | static struct snd_soc_device smdk2443_snd_ac97_devdata = { | 44 | static struct snd_soc_device smdk2443_snd_ac97_devdata = { |
44 | .card = &smdk2443, | 45 | .card = &smdk2443, |
45 | .platform = &s3c24xx_soc_platform, | ||
46 | .codec_dev = &soc_codec_dev_ac97, | 46 | .codec_dev = &soc_codec_dev_ac97, |
47 | }; | 47 | }; |
48 | 48 | ||