From: Johan Hovold <johan@hovoldconsulting.com>
Date: Thu, 21 Jan 2016 16:34:11 +0000 (+0100)
Subject: greybus: connection: drop protocol parameter from static interface
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bafe3f67908c68a0b1fdc527c79cd7d9106abd85;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

greybus: connection: drop protocol parameter from static interface

Drop legacy protocol parameter from static connection interface.

Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
---

diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index c92af6e1a11f..9b8112bd16a0 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -217,11 +217,9 @@ err_unlock:
 }
 
 struct gb_connection *
-gb_connection_create_static(struct gb_host_device *hd,
-					u16 hd_cport_id, u8 protocol_id)
+gb_connection_create_static(struct gb_host_device *hd, u16 hd_cport_id)
 {
-	return gb_connection_create(hd, hd_cport_id, NULL, NULL, 0,
-								protocol_id);
+	return gb_connection_create(hd, hd_cport_id, NULL, NULL, 0, 0);
 }
 
 struct gb_connection *
diff --git a/drivers/staging/greybus/connection.h b/drivers/staging/greybus/connection.h
index 66f37b2f4a38..562bd2b47ac5 100644
--- a/drivers/staging/greybus/connection.h
+++ b/drivers/staging/greybus/connection.h
@@ -56,7 +56,7 @@ struct gb_connection {
 };
 
 struct gb_connection *gb_connection_create_static(struct gb_host_device *hd,
-				u16 hd_cport_id, u8 protocol_id);
+				u16 hd_cport_id);
 struct gb_connection *gb_connection_create_dynamic(struct gb_interface *intf,
 				struct gb_bundle *bundle, u16 cport_id,
 				u8 protocol_id);
diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c
index 8c675d3215e1..472997e71343 100644
--- a/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@ -895,8 +895,7 @@ struct gb_svc *gb_svc_create(struct gb_host_device *hd)
 		goto err_put_device;
 	}
 
-	svc->connection = gb_connection_create_static(hd, GB_SVC_CPORT_ID,
-							GREYBUS_PROTOCOL_SVC);
+	svc->connection = gb_connection_create_static(hd, GB_SVC_CPORT_ID);
 	if (!svc->connection) {
 		dev_err(&svc->dev, "failed to create connection\n");
 		goto err_free_input;