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, 45 insertions, 45 deletions

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 9feaa7b6dc34..c5cb9516fea4 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -620,7 +620,7 @@ static struct snd_pcm_ops soc_pcm_ops = {
 static int soc_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_machine *machine = socdev->machine;
+        struct snd_soc_card *card = socdev->card;
         struct snd_soc_platform *platform = socdev->platform;
         struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
         struct snd_soc_codec *codec = socdev->codec;
@@ -644,14 +644,14 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
         }
 
         /* suspend all pcms */
-        for (i = 0; i < machine->num_links; i++)
-                snd_pcm_suspend_all(machine->dai_link[i].pcm);
+        for (i = 0; i < card->num_links; i++)
+                snd_pcm_suspend_all(card->dai_link[i].pcm);
 
-        if (machine->suspend_pre)
-                machine->suspend_pre(pdev, state);
+        if (card->suspend_pre)
+                card->suspend_pre(pdev, state);
 
-        for (i = 0; i < machine->num_links; i++) {
-                struct snd_soc_dai  *cpu_dai = machine->dai_link[i].cpu_dai;
+        for (i = 0; i < card->num_links; i++) {
+                struct snd_soc_dai  *cpu_dai = card->dai_link[i].cpu_dai;
                 if (cpu_dai->suspend && cpu_dai->type != SND_SOC_DAI_AC97)
                         cpu_dai->suspend(pdev, cpu_dai);
                 if (platform->suspend)
@@ -676,14 +676,14 @@ static int soc_suspend(struct platform_device *pdev, pm_message_t state)
         if (codec_dev->suspend)
                 codec_dev->suspend(pdev, state);
 
-        for (i = 0; i < machine->num_links; i++) {
-                struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;
+        for (i = 0; i < card->num_links; i++) {
+                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
                 if (cpu_dai->suspend && cpu_dai->type == SND_SOC_DAI_AC97)
                         cpu_dai->suspend(pdev, cpu_dai);
         }
 
-        if (machine->suspend_post)
-                machine->suspend_post(pdev, state);
+        if (card->suspend_post)
+                card->suspend_post(pdev, state);
 
         return 0;
 }
@@ -696,7 +696,7 @@ static void soc_resume_deferred(struct work_struct *work)
         struct snd_soc_device *socdev = container_of(work,
                                                      struct snd_soc_device,
                                                      deferred_resume_work);
-        struct snd_soc_machine *machine = socdev->machine;
+        struct snd_soc_card *card = socdev->card;
         struct snd_soc_platform *platform = socdev->platform;
         struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
         struct snd_soc_codec *codec = socdev->codec;
@@ -709,11 +709,11 @@ static void soc_resume_deferred(struct work_struct *work)
 
         dev_info(socdev->dev, "starting resume work\n");
 
-        if (machine->resume_pre)
-                machine->resume_pre(pdev);
+        if (card->resume_pre)
+                card->resume_pre(pdev);
 
-        for (i = 0; i < machine->num_links; i++) {
-                struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;
+        for (i = 0; i < card->num_links; i++) {
+                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
                 if (cpu_dai->resume && cpu_dai->type == SND_SOC_DAI_AC97)
                         cpu_dai->resume(pdev, cpu_dai);
         }
@@ -739,16 +739,16 @@ static void soc_resume_deferred(struct work_struct *work)
                         dai->dai_ops.digital_mute(dai, 0);
         }
 
-        for (i = 0; i < machine->num_links; i++) {
-                struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;
+        for (i = 0; i < card->num_links; i++) {
+                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
                 if (cpu_dai->resume && cpu_dai->type != SND_SOC_DAI_AC97)
                         cpu_dai->resume(pdev, cpu_dai);
                 if (platform->resume)
                         platform->resume(pdev, cpu_dai);
         }
 
-        if (machine->resume_post)
-                machine->resume_post(pdev);
+        if (card->resume_post)
+                card->resume_post(pdev);
 
         dev_info(socdev->dev, "resume work completed\n");
 
@@ -779,18 +779,18 @@ static int soc_probe(struct platform_device *pdev)
 {
         int ret = 0, i;
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_machine *machine = socdev->machine;
+        struct snd_soc_card *card = socdev->card;
         struct snd_soc_platform *platform = socdev->platform;
         struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
 
-        if (machine->probe) {
-                ret = machine->probe(pdev);
+        if (card->probe) {
+                ret = card->probe(pdev);
                 if (ret < 0)
                         return ret;
         }
 
-        for (i = 0; i < machine->num_links; i++) {
-                struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;
+        for (i = 0; i < card->num_links; i++) {
+                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
                 if (cpu_dai->probe) {
                         ret = cpu_dai->probe(pdev, cpu_dai);
                         if (ret < 0)
@@ -825,13 +825,13 @@ platform_err:
 
 cpu_dai_err:
         for (i--; i >= 0; i--) {
-                struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;
+                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
                 if (cpu_dai->remove)
                         cpu_dai->remove(pdev, cpu_dai);
         }
 
-        if (machine->remove)
-                machine->remove(pdev);
+        if (card->remove)
+                card->remove(pdev);
 
         return ret;
 }
@@ -841,7 +841,7 @@ static int soc_remove(struct platform_device *pdev)
 {
         int i;
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_machine *machine = socdev->machine;
+        struct snd_soc_card *card = socdev->card;
         struct snd_soc_platform *platform = socdev->platform;
         struct snd_soc_codec_device *codec_dev = socdev->codec_dev;
 
@@ -853,14 +853,14 @@ static int soc_remove(struct platform_device *pdev)
         if (codec_dev->remove)
                 codec_dev->remove(pdev);
 
-        for (i = 0; i < machine->num_links; i++) {
-                struct snd_soc_dai *cpu_dai = machine->dai_link[i].cpu_dai;
+        for (i = 0; i < card->num_links; i++) {
+                struct snd_soc_dai *cpu_dai = card->dai_link[i].cpu_dai;
                 if (cpu_dai->remove)
                         cpu_dai->remove(pdev, cpu_dai);
         }
 
-        if (machine->remove)
-                machine->remove(pdev);
+        if (card->remove)
+                card->remove(pdev);
 
         return 0;
 }
@@ -1212,7 +1212,7 @@ EXPORT_SYMBOL_GPL(snd_soc_test_bits);
 int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid)
 {
         struct snd_soc_codec *codec = socdev->codec;
-        struct snd_soc_machine *machine = socdev->machine;
+        struct snd_soc_card *card = socdev->card;
         int ret = 0, i;
 
         mutex_lock(&codec->mutex);
@@ -1231,11 +1231,11 @@ int snd_soc_new_pcms(struct snd_soc_device *socdev, int idx, const char *xid)
         strncpy(codec->card->driver, codec->name, sizeof(codec->card->driver));
 
         /* create the pcms */
-        for (i = 0; i < machine->num_links; i++) {
-                ret = soc_new_pcm(socdev, &machine->dai_link[i], i);
+        for (i = 0; i < card->num_links; i++) {
+                ret = soc_new_pcm(socdev, &card->dai_link[i], i);
                 if (ret < 0) {
                         printk(KERN_ERR "asoc: can't create pcm %s\n",
-                                machine->dai_link[i].stream_name);
+                                card->dai_link[i].stream_name);
                         mutex_unlock(&codec->mutex);
                         return ret;
                 }
@@ -1258,26 +1258,26 @@ EXPORT_SYMBOL_GPL(snd_soc_new_pcms);
 int snd_soc_register_card(struct snd_soc_device *socdev)
 {
         struct snd_soc_codec *codec = socdev->codec;
-        struct snd_soc_machine *machine = socdev->machine;
+        struct snd_soc_card *card = socdev->card;
         int ret = 0, i, ac97 = 0, err = 0;
 
-        for (i = 0; i < machine->num_links; i++) {
-                if (socdev->machine->dai_link[i].init) {
-                        err = socdev->machine->dai_link[i].init(codec);
+        for (i = 0; i < card->num_links; i++) {
+                if (card->dai_link[i].init) {
+                        err = card->dai_link[i].init(codec);
                         if (err < 0) {
                                 printk(KERN_ERR "asoc: failed to init %s\n",
-                                        socdev->machine->dai_link[i].stream_name);
+                                        card->dai_link[i].stream_name);
                                 continue;
                         }
                 }
-                if (socdev->machine->dai_link[i].codec_dai->type ==
+                if (card->dai_link[i].codec_dai->type ==
                         SND_SOC_DAI_AC97_BUS)
                         ac97 = 1;
         }
         snprintf(codec->card->shortname, sizeof(codec->card->shortname),
-                 "%s", machine->name);
+                 "%s",  card->name);
         snprintf(codec->card->longname, sizeof(codec->card->longname),
-                 "%s (%s)", machine->name, codec->name);
+                 "%s (%s)", card->name, codec->name);
 
         ret = snd_card_register(codec->card);
         if (ret < 0) {