ASoC: dapm: Remove always true path source/sink checks
A path has always a valid source and a valid sink otherwise we wouldn't add it in the first place. Hence all tests that check if sink/source is non NULL always evaluate to true and can be removed. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Родитель
cdc4508b4d
Коммит
7ddd4cd5c3
|
@ -909,7 +909,7 @@ static int is_connected_output_ep(struct snd_soc_dapm_widget *widget,
|
|||
|
||||
trace_snd_soc_dapm_output_path(widget, path);
|
||||
|
||||
if (path->sink && path->connect) {
|
||||
if (path->connect) {
|
||||
path->walked = 1;
|
||||
path->walking = 1;
|
||||
|
||||
|
@ -1017,7 +1017,7 @@ static int is_connected_input_ep(struct snd_soc_dapm_widget *widget,
|
|||
|
||||
trace_snd_soc_dapm_input_path(widget, path);
|
||||
|
||||
if (path->source && path->connect) {
|
||||
if (path->connect) {
|
||||
path->walked = 1;
|
||||
path->walking = 1;
|
||||
|
||||
|
@ -1219,9 +1219,6 @@ static int dapm_supply_check_power(struct snd_soc_dapm_widget *w)
|
|||
!path->connected(path->source, path->sink))
|
||||
continue;
|
||||
|
||||
if (!path->sink)
|
||||
continue;
|
||||
|
||||
if (dapm_widget_power_check(path->sink))
|
||||
return 1;
|
||||
}
|
||||
|
@ -1636,12 +1633,9 @@ static void dapm_widget_set_power(struct snd_soc_dapm_widget *w, bool power,
|
|||
/* If we changed our power state perhaps our neigbours changed
|
||||
* also.
|
||||
*/
|
||||
list_for_each_entry(path, &w->sources, list_sink) {
|
||||
if (path->source) {
|
||||
dapm_widget_set_peer_power(path->source, power,
|
||||
path->connect);
|
||||
}
|
||||
}
|
||||
list_for_each_entry(path, &w->sources, list_sink)
|
||||
dapm_widget_set_peer_power(path->source, power, path->connect);
|
||||
|
||||
switch (w->id) {
|
||||
case snd_soc_dapm_supply:
|
||||
case snd_soc_dapm_regulator_supply:
|
||||
|
@ -1650,12 +1644,9 @@ static void dapm_widget_set_power(struct snd_soc_dapm_widget *w, bool power,
|
|||
/* Supplies can't affect their outputs, only their inputs */
|
||||
break;
|
||||
default:
|
||||
list_for_each_entry(path, &w->sinks, list_source) {
|
||||
if (path->sink) {
|
||||
dapm_widget_set_peer_power(path->sink, power,
|
||||
path->connect);
|
||||
}
|
||||
}
|
||||
list_for_each_entry(path, &w->sinks, list_source)
|
||||
dapm_widget_set_peer_power(path->sink, power,
|
||||
path->connect);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче