1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/sound/alsa/soc/machine.txt b/Documentation/sound/alsa/soc/machine.txt
index 72bd222f2a21..f370e7db86af 100644
--- a/Documentation/sound/alsa/soc/machine.txt
+++ b/Documentation/sound/alsa/soc/machine.txt
@@ -16,7 +16,7 @@ struct snd_soc_machine {
        int (*remove)(struct platform_device *pdev);
        /* the pre and post PM functions are used to do any PM work before and
-         * after the codec and DAI's do any PM work. */
+         * after the codec and DAIs do any PM work. */
        int (*suspend_pre)(struct platform_device *pdev, pm_message_t state);
        int (*suspend_post)(struct platform_device *pdev, pm_message_t state);
        int (*resume_pre)(struct platform_device *pdev);
@@ -38,7 +38,7 @@ probe/remove are optional. Do any machine specific probe here.
 suspend()/resume()
 ------------------
 The machine driver has pre and post versions of suspend and resume to take care
-of any machine audio tasks that have to be done before or after the codec, DAI's
+of any machine audio tasks that have to be done before or after the codec, DAIs
 and DMA is suspended and resumed. Optional.
@@ -49,10 +49,10 @@ The machine specific audio operations can be set here. Again this is optional.
 Machine DAI Configuration
 -------------------------
-The machine DAI configuration glues all the codec and CPU DAI's together. It can
+The machine DAI configuration glues all the codec and CPU DAIs together. It can
 also be used to set up the DAI system clock and for any machine related DAI
 initialisation e.g. the machine audio map can be connected to the codec audio
-map, unconnnected codec pins can be set as such. Please see corgi.c, spitz.c
+map, unconnected codec pins can be set as such. Please see corgi.c, spitz.c
 for examples.
 struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.
@@ -67,7 +67,7 @@ static struct snd_soc_dai_link corgi_dai = {
        .ops = &corgi_ops,
 };
-struct snd_soc_machine then sets up the machine with it's DAI's. e.g.
+struct snd_soc_machine then sets up the machine with it's DAIs. e.g.
 /* corgi audio machine driver */
 static struct snd_soc_machine snd_soc_machine_corgi = {
@@ -110,4 +110,4 @@ details.
 Machine Controls
 ----------------
-Machine specific audio mixer controls can be added in the dai init function.
-\ No newline at end of file
+Machine specific audio mixer controls can be added in the DAI init function.

diff --git a/Documentation/sound/alsa/soc/machine.txt b/Documentation/sound/alsa/soc/machine.txt index 72bd222f2a21..f370e7db86af 100644 --- a/Documentation/sound/alsa/soc/machine.txt +++ b/Documentation/sound/alsa/soc/machine.txt
@@ -16,7 +16,7 @@ struct snd_soc_machine {
16	int (remove)(struct platform_device pdev);	16	int (remove)(struct platform_device pdev);
17		17
18	/* the pre and post PM functions are used to do any PM work before and	18	/* the pre and post PM functions are used to do any PM work before and
19	* after the codec and DAI's do any PM work. */	19	* after the codec and DAIs do any PM work. */
20	int (suspend_pre)(struct platform_device pdev, pm_message_t state);	20	int (suspend_pre)(struct platform_device pdev, pm_message_t state);
21	int (suspend_post)(struct platform_device pdev, pm_message_t state);	21	int (suspend_post)(struct platform_device pdev, pm_message_t state);
22	int (resume_pre)(struct platform_device pdev);	22	int (resume_pre)(struct platform_device pdev);
@@ -38,7 +38,7 @@ probe/remove are optional. Do any machine specific probe here.
38	suspend()/resume()	38	suspend()/resume()
39	------------------	39	------------------
40	The machine driver has pre and post versions of suspend and resume to take care	40	The machine driver has pre and post versions of suspend and resume to take care
41	of any machine audio tasks that have to be done before or after the codec, DAI's	41	of any machine audio tasks that have to be done before or after the codec, DAIs
42	and DMA is suspended and resumed. Optional.	42	and DMA is suspended and resumed. Optional.
43		43
44		44
@@ -49,10 +49,10 @@ The machine specific audio operations can be set here. Again this is optional.
49		49
50	Machine DAI Configuration	50	Machine DAI Configuration
51	-------------------------	51	-------------------------
52	The machine DAI configuration glues all the codec and CPU DAI's together. It can	52	The machine DAI configuration glues all the codec and CPU DAIs together. It can
53	also be used to set up the DAI system clock and for any machine related DAI	53	also be used to set up the DAI system clock and for any machine related DAI
54	initialisation e.g. the machine audio map can be connected to the codec audio	54	initialisation e.g. the machine audio map can be connected to the codec audio
55	map, unconnnected codec pins can be set as such. Please see corgi.c, spitz.c	55	map, unconnected codec pins can be set as such. Please see corgi.c, spitz.c
56	for examples.	56	for examples.
57		57
58	struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.	58	struct snd_soc_dai_link is used to set up each DAI in your machine. e.g.
@@ -67,7 +67,7 @@ static struct snd_soc_dai_link corgi_dai = {
67	.ops = &corgi_ops,	67	.ops = &corgi_ops,
68	};	68	};
69		69
70	struct snd_soc_machine then sets up the machine with it's DAI's. e.g.	70	struct snd_soc_machine then sets up the machine with it's DAIs. e.g.
71		71
72	/* corgi audio machine driver */	72	/* corgi audio machine driver */
73	static struct snd_soc_machine snd_soc_machine_corgi = {	73	static struct snd_soc_machine snd_soc_machine_corgi = {
@@ -110,4 +110,4 @@ details.
110	Machine Controls	110	Machine Controls
111	----------------	111	----------------
112		112
113	Machine specific audio mixer controls can be added in the dai init function. \ No newline at end of file	113	Machine specific audio mixer controls can be added in the DAI init function.