Skip to content

Commit

Permalink
component: move check for unbound master into try_to_bring_up_masters()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Russell King committed Dec 7, 2015
1 parent fae9e2e commit 29f1c7f
Showing 1 changed file with 5 additions and 10 deletions.
15 changes: 5 additions & 10 deletions drivers/base/component.c
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,6 @@ static int try_to_bring_up_master(struct master *master,
{
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)) {
/* Failed to find all components */
ret = 0;
Expand Down Expand Up @@ -196,9 +189,11 @@ static int try_to_bring_up_masters(struct component *component)
int ret = 0;

list_for_each_entry(m, &masters, node) {
ret = try_to_bring_up_master(m, component);
if (ret != 0)
break;
if (!m->bound) {
ret = try_to_bring_up_master(m, component);
if (ret != 0)
break;
}
}

return ret;
Expand Down

0 comments on commit 29f1c7f

Please sign in to comment.