Commit 2846d3ed authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

greybus: connection: add protocol-version helper

Add protocol-version to improve readability.
Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 9d7fc25b
...@@ -412,9 +412,30 @@ gb_connection_control_disconnected(struct gb_connection *connection) ...@@ -412,9 +412,30 @@ gb_connection_control_disconnected(struct gb_connection *connection)
} }
} }
/*
* Request protocol version supported by the module. We don't need to do
* this for SVC as that is initiated by the SVC.
*/
static int gb_connection_protocol_get_version(struct gb_connection *connection)
{
struct gb_protocol *protocol = connection->protocol;
int ret;
if (protocol->flags & GB_PROTOCOL_SKIP_VERSION)
return 0;
ret = gb_protocol_get_version(connection);
if (ret) {
dev_err(&connection->dev,
"failed to get protocol version: %d\n", ret);
return ret;
}
return 0;
}
static int gb_connection_init(struct gb_connection *connection) static int gb_connection_init(struct gb_connection *connection)
{ {
int cport_id = connection->intf_cport_id;
struct gb_protocol *protocol = connection->protocol; struct gb_protocol *protocol = connection->protocol;
int ret; int ret;
...@@ -431,19 +452,9 @@ static int gb_connection_init(struct gb_connection *connection) ...@@ -431,19 +452,9 @@ static int gb_connection_init(struct gb_connection *connection)
connection->state = GB_CONNECTION_STATE_ENABLED; connection->state = GB_CONNECTION_STATE_ENABLED;
spin_unlock_irq(&connection->lock); spin_unlock_irq(&connection->lock);
/* ret = gb_connection_protocol_get_version(connection);
* Request protocol version supported by the module. We don't need to do if (ret)
* this for SVC as that is initiated by the SVC. goto err_disconnect;
*/
if (!(protocol->flags & GB_PROTOCOL_SKIP_VERSION)) {
ret = gb_protocol_get_version(connection);
if (ret) {
dev_err(&connection->dev,
"Failed to get version CPort-%d (%d)\n",
cport_id, ret);
goto err_disconnect;
}
}
ret = protocol->connection_init(connection); ret = protocol->connection_init(connection);
if (ret) if (ret)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment