diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-02 16:01:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2008-12-02 16:03:40 +0000 |
| commit | 87689d567a45f80416feea0a2aa6d3a2a6b8963a (patch) | |
| tree | d33d923e9e359f3be124d0a63c30b41637b9f933 /sound/soc/fsl | |
| parent | 6308419a199eed66086cd756ab8dc81b88d54a6b (diff) | |
| download | talos-obmc-linux-87689d567a45f80416feea0a2aa6d3a2a6b8963a.tar.gz talos-obmc-linux-87689d567a45f80416feea0a2aa6d3a2a6b8963a.zip | |
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/fsl')
| -rw-r--r-- | sound/soc/fsl/mpc8610_hpcd.c | 2 | ||||
| -rw-r--r-- | sound/soc/fsl/soc-of-simple.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c index 1cf4d6eeb538..bcec3f60bad9 100644 --- a/sound/soc/fsl/mpc8610_hpcd.c +++ b/sound/soc/fsl/mpc8610_hpcd.c @@ -467,7 +467,7 @@ static int mpc8610_hpcd_probe(struct of_device *ofdev, machine_data->sound_devdata.card = &mpc8610_hpcd_machine; machine_data->sound_devdata.codec_dev = &soc_codec_device_cs4270; - machine_data->sound_devdata.platform = &fsl_soc_platform; + machine_data->machine.platform = &fsl_soc_platform; sound_device->dev.platform_data = machine_data; diff --git a/sound/soc/fsl/soc-of-simple.c b/sound/soc/fsl/soc-of-simple.c index 53be6491320a..8bc5cd9e972f 100644 --- a/sound/soc/fsl/soc-of-simple.c +++ b/sound/soc/fsl/soc-of-simple.c @@ -158,7 +158,7 @@ int of_snd_soc_register_platform(struct snd_soc_platform *platform, of_soc->platform_node = node; of_soc->dai_link.cpu_dai = cpu_dai; - of_soc->device.platform = platform; + of_soc->card.platform = platform; of_soc->card.name = of_soc->dai_link.cpu_dai->name; /* Now try to register the SoC device */ |
