Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
d872f046
Commit
d872f046
authored
Apr 30, 2017
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/core' into asoc-next
parents
9dfc5394
991454e1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
12 deletions
+6
-12
include/sound/soc.h
include/sound/soc.h
+0
-1
sound/soc/soc-core.c
sound/soc/soc-core.c
+6
-11
No files found.
include/sound/soc.h
View file @
d872f046
...
@@ -812,7 +812,6 @@ struct snd_soc_component {
...
@@ -812,7 +812,6 @@ struct snd_soc_component {
unsigned
int
ignore_pmdown_time
:
1
;
/* pmdown_time is ignored at stop */
unsigned
int
ignore_pmdown_time
:
1
;
/* pmdown_time is ignored at stop */
unsigned
int
registered_as_component
:
1
;
unsigned
int
registered_as_component
:
1
;
unsigned
int
auxiliary
:
1
;
/* for auxiliary component of the card */
unsigned
int
suspended
:
1
;
/* is in suspend PM state */
unsigned
int
suspended
:
1
;
/* is in suspend PM state */
struct
list_head
list
;
struct
list_head
list
;
...
...
sound/soc/soc-core.c
View file @
d872f046
...
@@ -1776,7 +1776,6 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
...
@@ -1776,7 +1776,6 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
}
}
component
->
init
=
aux_dev
->
init
;
component
->
init
=
aux_dev
->
init
;
component
->
auxiliary
=
1
;
list_add
(
&
component
->
card_aux_list
,
&
card
->
aux_comp_list
);
list_add
(
&
component
->
card_aux_list
,
&
card
->
aux_comp_list
);
return
0
;
return
0
;
...
@@ -1788,14 +1787,13 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
...
@@ -1788,14 +1787,13 @@ static int soc_bind_aux_dev(struct snd_soc_card *card, int num)
static
int
soc_probe_aux_devices
(
struct
snd_soc_card
*
card
)
static
int
soc_probe_aux_devices
(
struct
snd_soc_card
*
card
)
{
{
struct
snd_soc_component
*
comp
,
*
tmp
;
struct
snd_soc_component
*
comp
;
int
order
;
int
order
;
int
ret
;
int
ret
;
for
(
order
=
SND_SOC_COMP_ORDER_FIRST
;
order
<=
SND_SOC_COMP_ORDER_LAST
;
for
(
order
=
SND_SOC_COMP_ORDER_FIRST
;
order
<=
SND_SOC_COMP_ORDER_LAST
;
order
++
)
{
order
++
)
{
list_for_each_entry_safe
(
comp
,
tmp
,
&
card
->
aux_comp_list
,
list_for_each_entry
(
comp
,
&
card
->
aux_comp_list
,
card_aux_list
)
{
card_aux_list
)
{
if
(
comp
->
driver
->
probe_order
==
order
)
{
if
(
comp
->
driver
->
probe_order
==
order
)
{
ret
=
soc_probe_component
(
card
,
comp
);
ret
=
soc_probe_component
(
card
,
comp
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
...
@@ -1804,7 +1802,6 @@ static int soc_probe_aux_devices(struct snd_soc_card *card)
...
@@ -1804,7 +1802,6 @@ static int soc_probe_aux_devices(struct snd_soc_card *card)
comp
->
name
,
ret
);
comp
->
name
,
ret
);
return
ret
;
return
ret
;
}
}
list_del
(
&
comp
->
card_aux_list
);
}
}
}
}
}
}
...
@@ -1820,14 +1817,12 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
...
@@ -1820,14 +1817,12 @@ static void soc_remove_aux_devices(struct snd_soc_card *card)
for
(
order
=
SND_SOC_COMP_ORDER_FIRST
;
order
<=
SND_SOC_COMP_ORDER_LAST
;
for
(
order
=
SND_SOC_COMP_ORDER_FIRST
;
order
<=
SND_SOC_COMP_ORDER_LAST
;
order
++
)
{
order
++
)
{
list_for_each_entry_safe
(
comp
,
_comp
,
list_for_each_entry_safe
(
comp
,
_comp
,
&
card
->
component_dev_list
,
card_list
)
{
&
card
->
aux_comp_list
,
card_aux_list
)
{
if
(
!
comp
->
auxiliary
)
continue
;
if
(
comp
->
driver
->
remove_order
==
order
)
{
if
(
comp
->
driver
->
remove_order
==
order
)
{
soc_remove_component
(
comp
);
soc_remove_component
(
comp
);
comp
->
auxiliary
=
0
;
/* remove it from the card's aux_comp_list */
list_del
(
&
comp
->
card_aux_list
);
}
}
}
}
}
}
...
@@ -3139,7 +3134,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
...
@@ -3139,7 +3134,7 @@ static int snd_soc_component_initialize(struct snd_soc_component *component,
component
->
suspend
=
component
->
driver
->
suspend
;
component
->
suspend
=
component
->
driver
->
suspend
;
component
->
resume
=
component
->
driver
->
resume
;
component
->
resume
=
component
->
driver
->
resume
;
component
->
pcm_new
=
component
->
driver
->
pcm_new
;
component
->
pcm_new
=
component
->
driver
->
pcm_new
;
component
->
pcm_free
=
component
->
driver
->
pcm_free
;
component
->
pcm_free
=
component
->
driver
->
pcm_free
;
dapm
=
&
component
->
dapm
;
dapm
=
&
component
->
dapm
;
dapm
->
dev
=
dev
;
dapm
->
dev
=
dev
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment