projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ASoC: Rename snd_soc_card to snd_soc_machine
[firefly-linux-kernel-4.4.55.git]
/
Documentation
/
sound
/
alsa
/
soc
/
machine.txt
diff --git
a/Documentation/sound/alsa/soc/machine.txt
b/Documentation/sound/alsa/soc/machine.txt
index f370e7db86af6a970de14433523af4b1ca71d390..4a9f51e2905c3c95cff3e0459b7674e47e70c851 100644
(file)
--- a/
Documentation/sound/alsa/soc/machine.txt
+++ b/
Documentation/sound/alsa/soc/machine.txt
@@
-9,7
+9,7
@@
the audio subsystem with the kernel as a platform device and is represented by
the following struct:-
/* SoC machine */
the following struct:-
/* SoC machine */
-struct snd_soc_
machine {
+struct snd_soc_
card {_
char *name;
int (*probe)(struct platform_device *pdev);
char *name;
int (*probe)(struct platform_device *pdev);
@@
-67,10
+67,10
@@
static struct snd_soc_dai_link corgi_dai = {
.ops = &corgi_ops,
};
.ops = &corgi_ops,
};
-struct snd_soc_
machine
then sets up the machine with it's DAIs. e.g.
+struct snd_soc_
card
then sets up the machine with it's DAIs. e.g.
/* corgi audio machine driver */
/* corgi audio machine driver */
-static struct snd_soc_
machine snd_soc_machine
_corgi = {
+static struct snd_soc_
card snd_soc
_corgi = {
.name = "Corgi",
.dai_link = &corgi_dai,
.num_links = 1,
.name = "Corgi",
.dai_link = &corgi_dai,
.num_links = 1,
@@
-90,7
+90,7
@@
static struct wm8731_setup_data corgi_wm8731_setup = {
/* corgi audio subsystem */
static struct snd_soc_device corgi_snd_devdata = {
/* corgi audio subsystem */
static struct snd_soc_device corgi_snd_devdata = {
- .machine = &snd_soc_
machine_
corgi,
+ .machine = &snd_soc_corgi,
.platform = &pxa2xx_soc_platform,
.codec_dev = &soc_codec_dev_wm8731,
.codec_data = &corgi_wm8731_setup,
.platform = &pxa2xx_soc_platform,
.codec_dev = &soc_codec_dev_wm8731,
.codec_data = &corgi_wm8731_setup,