greybus: protocol: Remove unnecessary params of gb_protocol_get_version()

Some of the parameters are not really required, drop them.

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

3 files changed, 14 insertions, 21 deletions

diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index b1f1df81be50..88383b6e603f 100644
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -387,12 +387,7 @@ int gb_connection_init(struct gb_connection *connection)
 	 * this for SVC as that is initiated by the SVC.
 	 */
 	if (connection->hd_cport_id != GB_SVC_CPORT_ID) {
-		struct gb_protocol_version_response response;
-
-		ret = gb_protocol_get_version(connection,
-					      GB_REQUEST_TYPE_PROTOCOL_VERSION,
-					      NULL, 0, &response,
-					      connection->protocol->major);
+		ret = gb_protocol_get_version(connection, NULL, 0);
 		if (ret) {
 			dev_err(&connection->dev,
 				"Failed to get version CPort-%d (%d)\n",
diff --git a/drivers/staging/greybus/protocol.c b/drivers/staging/greybus/protocol.c
index ba80f552fa31..b63e28c1b950 100644
--- a/drivers/staging/greybus/protocol.c
+++ b/drivers/staging/greybus/protocol.c
@@ -163,30 +163,30 @@ struct gb_protocol *gb_protocol_get(u8 id, u8 major, u8 minor)
 	return protocol;
 }
 
-int gb_protocol_get_version(struct gb_connection *connection, int type,
-			    void *request, int request_size,
-			    struct gb_protocol_version_response *response,
-			    __u8 major)
+int gb_protocol_get_version(struct gb_connection *connection, void *request,
+			    int request_size)
 {
+	struct gb_protocol_version_response response;
 	int retval;
 
-	retval = gb_operation_sync(connection, type, request, request_size,
-				   response, sizeof(*response));
+	retval = gb_operation_sync(connection, GB_REQUEST_TYPE_PROTOCOL_VERSION,
+				   request, request_size, &response,
+				   sizeof(response));
 	if (retval)
 		return retval;
 
-	if (response->major > major) {
+	if (response.major > connection->protocol->major) {
 		dev_err(&connection->dev,
 			"unsupported major version (%hhu > %hhu)\n",
-			response->major, major);
+			response.major, connection->protocol->major);
 		return -ENOTSUPP;
 	}
 
-	connection->module_major = response->major;
-	connection->module_minor = response->minor;
+	connection->module_major = response.major;
+	connection->module_minor = response.minor;
 
 	dev_dbg(&connection->dev, "version_major = %u version_minor = %u\n",
-		response->major, response->minor);
+		response.major, response.minor);
 
 	return 0;
 }
diff --git a/drivers/staging/greybus/protocol.h b/drivers/staging/greybus/protocol.h
index 45606adacf35..34a7f185a638 100644
--- a/drivers/staging/greybus/protocol.h
+++ b/drivers/staging/greybus/protocol.h
@@ -44,10 +44,8 @@ int gb_protocol_deregister(struct gb_protocol *protocol);
 	__gb_protocol_register(protocol, THIS_MODULE)
 
 struct gb_protocol *gb_protocol_get(u8 id, u8 major, u8 minor);
-int gb_protocol_get_version(struct gb_connection *connection, int type,
-			    void *request, int request_size,
-			    struct gb_protocol_version_response *response,
-			    __u8 major);
+int gb_protocol_get_version(struct gb_connection *connection, void *request,
+			    int request_size);
 
 void gb_protocol_put(struct gb_protocol *protocol);