diff options
| author | Johan Hovold <johan@hovoldconsulting.com> | 2015-12-07 15:05:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@google.com> | 2015-12-08 15:56:38 -0500 |
| commit | 708d07a9ea2f32ee3cf4fcbbba8d52c42302b39b (patch) | |
| tree | b96e9becd9ed51f2a043944ec6b2820c1094ac33 /drivers/staging/greybus/manifest.c | |
| parent | a7e36d0eac7fe9d8c66547ac4ec660b026ca4691 (diff) | |
| download | linux-708d07a9ea2f32ee3cf4fcbbba8d52c42302b39b.tar.bz2 | |
greybus: interface: separate manifest parsing from bundle registration
Separate manifest parsing, including bundle and connection creation,
from bundle registration.
Note that this is also needed to allow the interface to not be
registered until the manifest has been parsed.
Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/manifest.c')
| -rw-r--r-- | drivers/staging/greybus/manifest.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/staging/greybus/manifest.c b/drivers/staging/greybus/manifest.c index 51201128498d..357f9c64821b 100644 --- a/drivers/staging/greybus/manifest.c +++ b/drivers/staging/greybus/manifest.c @@ -286,14 +286,12 @@ exit: */ static u32 gb_manifest_parse_bundles(struct gb_interface *intf) { - struct gb_connection *connection; struct manifest_desc *desc; struct gb_bundle *bundle; struct gb_bundle *bundle_next; u32 count = 0; u8 bundle_id; u8 class; - int ret; while ((desc = get_next_bundle_desc(intf))) { struct greybus_descriptor_bundle *desc_bundle; @@ -349,23 +347,6 @@ static u32 gb_manifest_parse_bundles(struct gb_interface *intf) continue; } - ret = gb_bundle_add(bundle); - if (ret) { - gb_bundle_destroy(bundle); - continue; - } - - list_for_each_entry(connection, &bundle->connections, - bundle_links) { - ret = gb_connection_init(connection); - if (ret) - break; - } - if (ret) { - gb_bundle_destroy(bundle); - continue; - } - count++; } |