diff options
| author |  Viresh Kumar <viresh.kumar@linaro.org>
| 2015-07-01 12:13:58 +0530 |
|---|---|---|
| committer |  Greg Kroah-Hartman <gregkh@google.com>
| 2015-07-01 16:38:42 -0700 |
| commit | c3add7883c70b625b99c37ca89e6ec8733037ce3 (patch) | |
| tree | f5fe6f2f17ffdd6f482b6c8c5204ac69f37c7ab0 /drivers/staging/greybus/bundle.h | |
| parent | greybus: svc: Drop svc_set_route_send() (diff) | |
| download | linux-c3add7883c70b625b99c37ca89e6ec8733037ce3.tar.gz linux-c3add7883c70b625b99c37ca89e6ec8733037ce3.tar.bz2 linux-c3add7883c70b625b99c37ca89e6ec8733037ce3.zip | |
greybus: interface: device_id belongs to the interface
While introducing bundles, the device_id also got moved to the bundle,
whereas it identifies an interface block to the AP.
Move it back to interface instead of bundle.
Calls to gb_bundle(s)_init() are dropped as connections will be
initialized while they are created now, as device_id will be valid.
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/bundle.h')
| -rw-r--r-- | drivers/staging/greybus/bundle.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/staging/greybus/bundle.h b/drivers/staging/greybus/bundle.h index 887883dabfc0..60033b82ab3f 100644 --- a/drivers/staging/greybus/bundle.h +++ b/drivers/staging/greybus/bundle.h @@ -18,7 +18,6 @@ struct gb_bundle { struct gb_interface *intf; u8 id; u8 class; - u8 device_id; struct list_head connections; u8 *state; @@ -32,8 +31,8 @@ struct gb_bundle { struct gb_bundle *gb_bundle_create(struct gb_interface *intf, u8 bundle_id, u8 class); void gb_bundle_destroy(struct gb_bundle *bundle); -int gb_bundle_init(struct gb_bundle *bundle, u8 device_id); -int gb_bundles_init(struct gb_interface *intf, u8 device_id); +int gb_bundle_init(struct gb_bundle *bundle); +int gb_bundles_init(struct gb_interface *intf); struct gb_bundle *gb_bundle_find(struct gb_interface *intf, u8 bundle_id); void gb_bundle_bind_protocols(void); |