diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c
index 21dafcc3409a..71a4869e10b9 100644
--- a/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@ -148,6 +148,7 @@ void gb_svc_connection_destroy(struct gb_svc *svc, u8 intf1_id, u16 cport1_id,
 }
 EXPORT_SYMBOL_GPL(gb_svc_connection_destroy);
 
+/* Creates bi-directional routes between the devices */
 static int gb_svc_route_create(struct gb_svc *svc, u8 intf1_id, u8 dev1_id,
 			       u8 intf2_id, u8 dev2_id)
 {
@@ -305,14 +306,6 @@ static void svc_process_hotplug(struct work_struct *work)
 		goto ida_put;
 	}
 
-	ret = gb_svc_route_create(svc, intf_id, device_id, hd->endo->ap_intf_id,
-				  GB_DEVICE_ID_AP);
-	if (ret) {
-		dev_err(dev, "%s: Route create operation failed, interface %hhu device_id %hhu (%d)\n",
-			__func__, intf_id, device_id, ret);
-		goto ida_put;
-	}
-
 	ret = gb_interface_init(intf, device_id);
 	if (ret) {
 		dev_err(dev, "%s: Failed to initialize interface, interface %hhu device_id %hhu (%d)\n",