mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-06 08:46:46 +00:00
Code Issues Releases Wiki Activity

greybus: connection: remove legacy protocol id from core

Browse source 
Remove legacy protocol-id field that is only used by the legacy-protocol
driver from the connection structure.

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>
This commit is contained in:
Johan Hovold 2016-01-21 17:34:19 +01:00 committed by Greg Kroah-Hartman
parent 8278fae5d7
commit 63cf52f79b
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/greybus/connection.h
View file

@ -38,7 +38,6 @@ struct gb_connection {
gb_request_handler_t handler;
struct gb_protocol *protocol;
u8 protocol_id;
u8 module_major;
u8 module_minor;

15
drivers/staging/greybus/legacy.c
View file

@ -15,6 +15,7 @@
struct legacy_connection {
struct gb_connection *connection;
bool initialized;
u8 protocol_id;
};
struct legacy_data {
@ -38,8 +39,9 @@ static int legacy_connection_get_version(struct gb_connection *connection)
return 0;
}
static int legacy_connection_bind_protocol(struct gb_connection *connection)
static int legacy_connection_bind_protocol(struct legacy_connection *lc)
{
struct gb_connection *connection = lc->connection;
struct gb_protocol *protocol;
u8 major, minor;
@ -52,14 +54,11 @@ static int legacy_connection_bind_protocol(struct gb_connection *connection)
major = 0;
minor = 1;
protocol = gb_protocol_get(connection->protocol_id,
major,
minor);
protocol = gb_protocol_get(lc->protocol_id, major, minor);
if (!protocol) {
dev_err(&connection->hd->dev,
"protocol 0x%02x version %u.%u not found\n",
connection->protocol_id,
major, minor);
lc->protocol_id, major, minor);
return -EPROTONOSUPPORT;
}
connection->protocol = protocol;
@ -92,7 +91,7 @@ static int legacy_connection_init(struct legacy_connection *lc)
dev_dbg(&connection->bundle->dev, "%s - %s\n", __func__,
connection->name);
ret = legacy_connection_bind_protocol(lc->connection);
ret = legacy_connection_bind_protocol(lc);
if (ret)
return ret;
@ -152,7 +151,7 @@ static int legacy_connection_create(struct legacy_connection *lc,
return PTR_ERR(connection);
lc->connection = connection;
lc->connection->protocol_id = desc->protocol_id;
lc->protocol_id = desc->protocol_id;
return 0;
}