diff options
Diffstat (limited to 'sound/soc/fsl/soc-of-simple.c')
-rw-r--r-- | sound/soc/fsl/soc-of-simple.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/fsl/soc-of-simple.c b/sound/soc/fsl/soc-of-simple.c index 0382fdac51cd..53be6491320a 100644 --- a/sound/soc/fsl/soc-of-simple.c +++ b/sound/soc/fsl/soc-of-simple.c | |||
@@ -31,7 +31,7 @@ struct of_snd_soc_device { | |||
31 | int id; | 31 | int id; |
32 | struct list_head list; | 32 | struct list_head list; |
33 | struct snd_soc_device device; | 33 | struct snd_soc_device device; |
34 | struct snd_soc_machine machine; | 34 | struct snd_soc_card card; |
35 | struct snd_soc_dai_link dai_link; | 35 | struct snd_soc_dai_link dai_link; |
36 | struct platform_device *pdev; | 36 | struct platform_device *pdev; |
37 | struct device_node *platform_node; | 37 | struct device_node *platform_node; |
@@ -58,9 +58,9 @@ of_snd_soc_get_device(struct device_node *codec_node) | |||
58 | /* Initialize the structure and add it to the global list */ | 58 | /* Initialize the structure and add it to the global list */ |
59 | of_soc->codec_node = codec_node; | 59 | of_soc->codec_node = codec_node; |
60 | of_soc->id = of_snd_soc_next_index++; | 60 | of_soc->id = of_snd_soc_next_index++; |
61 | of_soc->machine.dai_link = &of_soc->dai_link; | 61 | of_soc->card.dai_link = &of_soc->dai_link; |
62 | of_soc->machine.num_links = 1; | 62 | of_soc->card.num_links = 1; |
63 | of_soc->device.machine = &of_soc->machine; | 63 | of_soc->device.card = &of_soc->card; |
64 | of_soc->dai_link.ops = &of_snd_soc_ops; | 64 | of_soc->dai_link.ops = &of_snd_soc_ops; |
65 | list_add(&of_soc->list, &of_snd_soc_device_list); | 65 | list_add(&of_soc->list, &of_snd_soc_device_list); |
66 | 66 | ||
@@ -159,7 +159,7 @@ int of_snd_soc_register_platform(struct snd_soc_platform *platform, | |||
159 | of_soc->platform_node = node; | 159 | of_soc->platform_node = node; |
160 | of_soc->dai_link.cpu_dai = cpu_dai; | 160 | of_soc->dai_link.cpu_dai = cpu_dai; |
161 | of_soc->device.platform = platform; | 161 | of_soc->device.platform = platform; |
162 | of_soc->machine.name = of_soc->dai_link.cpu_dai->name; | 162 | of_soc->card.name = of_soc->dai_link.cpu_dai->name; |
163 | 163 | ||
164 | /* Now try to register the SoC device */ | 164 | /* Now try to register the SoC device */ |
165 | of_snd_soc_register_device(of_soc); | 165 | of_snd_soc_register_device(of_soc); |