greybus: Merge branch 'master' into svc to keep it up to date.

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --combined drivers/staging/greybus/connection.c
index 1a657f706b93124303151ac521d057e1a6e9cb14,3b553e68235934dd2be53c29970a45da8ebc505c..e7f9c2f82982187f1d2c3feda60be003029fe4ad
--- 1/drivers/staging/greybus/connection.c
--- 2/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@@ -251,12 -251,7 +251,12 @@@ gb_connection_create_range(struct greyb
  
        spin_unlock_irq(&gb_connections_lock);
  
 -      /* XXX Will have to establish connections to get version */
 +      if (hd_cport_id != GB_SVC_CPORT_ID) {
 +              gb_svc_connection_create(hd->svc,
 +                                       hd->endo->ap_intf_id, hd_cport_id,
 +                                       bundle->intf->interface_id, cport_id);
 +      }
 +
        gb_connection_bind_protocol(connection);
        if (!connection->protocol)
                dev_warn(&connection->dev,
@@@ -349,8 -344,7 +349,7 @@@ int gb_connection_init(struct gb_connec
         * Inform Interface about Active CPorts. We don't need to do this
         * operation for control cport.
         */
-       if (cport_id != GB_CONTROL_CPORT_ID &&
-           connection->hd_cport_id != GB_SVC_CPORT_ID) {
+       if (cport_id != GB_CONTROL_CPORT_ID) {
                struct gb_control *control = connection->bundle->intf->control;
  
                ret = gb_control_connected_operation(control, cport_id);
@@@ -402,8 -396,7 +401,7 @@@ void gb_connection_exit(struct gb_conne
         * Inform Interface about In-active CPorts. We don't need to do this
         * operation for control cport.
         */
-       if (cport_id != GB_CONTROL_CPORT_ID &&
-           connection->hd_cport_id != GB_SVC_CPORT_ID) {
+       if (cport_id != GB_CONTROL_CPORT_ID) {
                struct gb_control *control = connection->bundle->intf->control;
                int ret;