korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 12:28:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

component: move check for unbound master into try_to_bring_up_masters()

Browse Source 
Clean up the code a little; we don't need to check that the master is
unbound for every invocation of try_to_bring_up_master(), so let's move
it to where it's really needed - try_to_bring_up_masters(), where we may
encounter already bound masters.

Reviewed-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2014-04-23 10:46:11 +01:00
parent fae9e2e07a
commit 29f1c7fd61
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/base/component.c
View File

@ -150,13 +150,6 @@ static int try_to_bring_up_master(struct master *master,
{ {
int ret; int ret;
if (master->bound)
return 0;
/*
* Search the list of components, looking for components that
* belong to this master, and attach them to the master.
*/
if (find_components(master)) { if (find_components(master)) {
/* Failed to find all components */ /* Failed to find all components */
ret = 0; ret = 0;
@ -196,9 +189,11 @@ static int try_to_bring_up_masters(struct component *component)
int ret = 0; int ret = 0;
list_for_each_entry(m, &masters, node) { list_for_each_entry(m, &masters, node) {
ret = try_to_bring_up_master(m, component); if (!m->bound) {
if (ret != 0) ret = try_to_bring_up_master(m, component);
break; if (ret != 0)
break;
}
} }
return ret; return ret;