diff options
author | Peter Meerwald-Stadler <pmeerw@pmeerw.net> | 2016-08-16 10:56:17 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-08-16 11:07:41 -0400 |
commit | c80460005743c6f253706a9a5618de81254c81bf (patch) | |
tree | 0b2d5cad2713bfec968d2844a2119c5c41ff04b5 | |
parent | 29b4817d4018df78086157ea3a55c1d9424a7cfc (diff) |
ASoC: dapm: Fix typos in comment
Signed-off-by: Peter Meerwald-Stadler <pmeerw@pmeerw.net>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | sound/soc/soc-dapm.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 8698c26773b3..c46b1ff52885 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -1169,7 +1169,7 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget, | |||
1169 | * @custom_stop_condition: (optional) a function meant to stop the widget graph | 1169 | * @custom_stop_condition: (optional) a function meant to stop the widget graph |
1170 | * walk based on custom logic. | 1170 | * walk based on custom logic. |
1171 | * | 1171 | * |
1172 | * Queries DAPM graph as to whether an valid audio stream path exists for | 1172 | * Queries DAPM graph as to whether a valid audio stream path exists for |
1173 | * the initial stream specified by name. This takes into account | 1173 | * the initial stream specified by name. This takes into account |
1174 | * current mixer and mux kcontrol settings. Creates list of valid widgets. | 1174 | * current mixer and mux kcontrol settings. Creates list of valid widgets. |
1175 | * | 1175 | * |
@@ -1294,8 +1294,7 @@ static int dapm_widget_power_check(struct snd_soc_dapm_widget *w) | |||
1294 | return w->new_power; | 1294 | return w->new_power; |
1295 | } | 1295 | } |
1296 | 1296 | ||
1297 | /* Generic check to see if a widget should be powered. | 1297 | /* Generic check to see if a widget should be powered. */ |
1298 | */ | ||
1299 | static int dapm_generic_check_power(struct snd_soc_dapm_widget *w) | 1298 | static int dapm_generic_check_power(struct snd_soc_dapm_widget *w) |
1300 | { | 1299 | { |
1301 | int in, out; | 1300 | int in, out; |
@@ -1646,7 +1645,7 @@ static void dapm_pre_sequence_async(void *data, async_cookie_t cookie) | |||
1646 | struct snd_soc_dapm_context *d = data; | 1645 | struct snd_soc_dapm_context *d = data; |
1647 | int ret; | 1646 | int ret; |
1648 | 1647 | ||
1649 | /* If we're off and we're not supposed to be go into STANDBY */ | 1648 | /* If we're off and we're not supposed to go into STANDBY */ |
1650 | if (d->bias_level == SND_SOC_BIAS_OFF && | 1649 | if (d->bias_level == SND_SOC_BIAS_OFF && |
1651 | d->target_bias_level != SND_SOC_BIAS_OFF) { | 1650 | d->target_bias_level != SND_SOC_BIAS_OFF) { |
1652 | if (d->dev) | 1651 | if (d->dev) |
@@ -1798,7 +1797,7 @@ static bool dapm_idle_bias_off(struct snd_soc_dapm_context *dapm) | |||
1798 | * A complete path is a route that has valid endpoints i.e.:- | 1797 | * A complete path is a route that has valid endpoints i.e.:- |
1799 | * | 1798 | * |
1800 | * o DAC to output pin. | 1799 | * o DAC to output pin. |
1801 | * o Input Pin to ADC. | 1800 | * o Input pin to ADC. |
1802 | * o Input pin to Output pin (bypass, sidetone) | 1801 | * o Input pin to Output pin (bypass, sidetone) |
1803 | * o DAC to ADC (loopback). | 1802 | * o DAC to ADC (loopback). |
1804 | */ | 1803 | */ |
@@ -2114,7 +2113,7 @@ static inline void dapm_debugfs_cleanup(struct snd_soc_dapm_context *dapm) | |||
2114 | * soc_dapm_connect_path() - Connects or disconnects a path | 2113 | * soc_dapm_connect_path() - Connects or disconnects a path |
2115 | * @path: The path to update | 2114 | * @path: The path to update |
2116 | * @connect: The new connect state of the path. True if the path is connected, | 2115 | * @connect: The new connect state of the path. True if the path is connected, |
2117 | * false if it is disconneted. | 2116 | * false if it is disconnected. |
2118 | * @reason: The reason why the path changed (for debugging only) | 2117 | * @reason: The reason why the path changed (for debugging only) |
2119 | */ | 2118 | */ |
2120 | static void soc_dapm_connect_path(struct snd_soc_dapm_path *path, | 2119 | static void soc_dapm_connect_path(struct snd_soc_dapm_path *path, |
@@ -2233,7 +2232,7 @@ static ssize_t dapm_widget_show_component(struct snd_soc_component *cmpnt, | |||
2233 | if (w->dapm != dapm) | 2232 | if (w->dapm != dapm) |
2234 | continue; | 2233 | continue; |
2235 | 2234 | ||
2236 | /* only display widgets that burnm power */ | 2235 | /* only display widgets that burn power */ |
2237 | switch (w->id) { | 2236 | switch (w->id) { |
2238 | case snd_soc_dapm_hp: | 2237 | case snd_soc_dapm_hp: |
2239 | case snd_soc_dapm_mic: | 2238 | case snd_soc_dapm_mic: |
@@ -2461,7 +2460,7 @@ static void dapm_update_widget_flags(struct snd_soc_dapm_widget *w) | |||
2461 | 2460 | ||
2462 | switch (w->id) { | 2461 | switch (w->id) { |
2463 | case snd_soc_dapm_input: | 2462 | case snd_soc_dapm_input: |
2464 | /* On a fully routed card a input is never a source */ | 2463 | /* On a fully routed card an input is never a source */ |
2465 | if (w->dapm->card->fully_routed) | 2464 | if (w->dapm->card->fully_routed) |
2466 | return; | 2465 | return; |
2467 | ep = SND_SOC_DAPM_EP_SOURCE; | 2466 | ep = SND_SOC_DAPM_EP_SOURCE; |
@@ -3445,7 +3444,7 @@ snd_soc_dapm_new_control_unlocked(struct snd_soc_dapm_context *dapm, | |||
3445 | w->endpoints[dir] = -1; | 3444 | w->endpoints[dir] = -1; |
3446 | } | 3445 | } |
3447 | 3446 | ||
3448 | /* machine layer set ups unconnected pins and insertions */ | 3447 | /* machine layer sets up unconnected pins and insertions */ |
3449 | w->connected = 1; | 3448 | w->connected = 1; |
3450 | return w; | 3449 | return w; |
3451 | } | 3450 | } |