ASoC: Rename snd_soc_card to snd_soc_machine

One of the issues with the ASoC v1 API which has been addressed in the
ASoC v2 work that Liam Girdwood has done is that the ALSA card provided
by ASoC is distributed around the ASoC structures. For example, machine
wide data such as the struct snd_card are maintained as part of the
CODEC data structure, preventing the use of multiple codecs. This has
been addressed by refactoring the data structures so that all the data
for the ALSA card is contained in a single structure snd_soc_card which
replaces the existing snd_soc_machine and snd_soc_device.

Begin the process of backporting this by renaming struct snd_soc_machine
to struct snd_soc_card, better reflecting its function and bringing it
closer to standard ALSA terminology.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/davinci/davinci-i2s.c
index 11c20d0b7bcc..95df51e803b4 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/davinci/davinci-i2s.c
@@ -375,8 +375,8 @@ static int davinci_i2s_probe(struct platform_device *pdev,
                              struct snd_soc_dai *dai)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_machine *machine = socdev->machine;
-        struct snd_soc_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;
+        struct snd_soc_card *card = socdev->card;
+        struct snd_soc_dai *cpu_dai = card->dai_link[pdev->id].cpu_dai;
         struct davinci_mcbsp_dev *dev;
         struct resource *mem, *ioarea;
         struct evm_snd_platform_data *pdata;
@@ -437,8 +437,8 @@ static void davinci_i2s_remove(struct platform_device *pdev,
                                struct snd_soc_dai *dai)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_machine *machine = socdev->machine;
-        struct snd_soc_dai *cpu_dai = machine->dai_link[pdev->id].cpu_dai;
+        struct snd_soc_card *card = socdev->card;
+        struct snd_soc_dai *cpu_dai = card->dai_link[pdev->id].cpu_dai;
         struct davinci_mcbsp_dev *dev = cpu_dai->private_data;
         struct resource *mem;