From e4c16f8b034047096187a9a9b49035ff5dbc8478 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 21 Jan 2016 17:34:13 +0100 Subject: [PATCH] greybus: connection: drop the legacy protocol-id parameter The protocol-id parameter is only used by the legacy driver so remove it from the generic interface and move it to the legacy driver until it can be removed completely. Reviewed-by: Viresh Kumar Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/connection.c | 15 +++++---------- drivers/staging/greybus/connection.h | 3 +-- drivers/staging/greybus/legacy.c | 5 +++-- 3 files changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c index f81f053a2e98..8c7f2eac7323 100644 --- a/drivers/staging/greybus/connection.c +++ b/drivers/staging/greybus/connection.c @@ -118,7 +118,6 @@ static void gb_connection_init_name(struct gb_connection *connection) * @intf: remote interface, or NULL for static connections * @bundle: remote-interface bundle (may be NULL) * @cport_id: remote-interface cport id, or 0 for static connections - * @protocol_id: protocol id * * Create a Greybus connection, representing the bidirectional link * between a CPort on a (local) Greybus host device and a CPort on @@ -135,8 +134,7 @@ static void gb_connection_init_name(struct gb_connection *connection) static struct gb_connection * gb_connection_create(struct gb_host_device *hd, int hd_cport_id, struct gb_interface *intf, - struct gb_bundle *bundle, int cport_id, - u8 protocol_id) + struct gb_bundle *bundle, int cport_id) { struct gb_connection *connection; struct ida *id_map = &hd->cport_id_map; @@ -173,8 +171,6 @@ gb_connection_create(struct gb_host_device *hd, int hd_cport_id, connection->hd = hd; connection->intf = intf; - connection->protocol_id = protocol_id; - connection->bundle = bundle; connection->state = GB_CONNECTION_STATE_DISABLED; @@ -219,22 +215,21 @@ err_unlock: struct gb_connection * gb_connection_create_static(struct gb_host_device *hd, u16 hd_cport_id) { - return gb_connection_create(hd, hd_cport_id, NULL, NULL, 0, 0); + return gb_connection_create(hd, hd_cport_id, NULL, NULL, 0); } struct gb_connection * gb_connection_create_control(struct gb_interface *intf) { - return gb_connection_create(intf->hd, -1, intf, NULL, 0, 0); + return gb_connection_create(intf->hd, -1, intf, NULL, 0); } struct gb_connection * gb_connection_create_dynamic(struct gb_interface *intf, struct gb_bundle *bundle, - u16 cport_id, u8 protocol_id) + u16 cport_id) { - return gb_connection_create(intf->hd, -1, intf, bundle, cport_id, - protocol_id); + return gb_connection_create(intf->hd, -1, intf, bundle, cport_id); } EXPORT_SYMBOL_GPL(gb_connection_create_dynamic); diff --git a/drivers/staging/greybus/connection.h b/drivers/staging/greybus/connection.h index cd4a093f6e9b..442bd49b5052 100644 --- a/drivers/staging/greybus/connection.h +++ b/drivers/staging/greybus/connection.h @@ -59,8 +59,7 @@ struct gb_connection *gb_connection_create_static(struct gb_host_device *hd, u16 hd_cport_id); struct gb_connection *gb_connection_create_control(struct gb_interface *intf); struct gb_connection *gb_connection_create_dynamic(struct gb_interface *intf, - struct gb_bundle *bundle, u16 cport_id, - u8 protocol_id); + struct gb_bundle *bundle, u16 cport_id); void gb_connection_destroy(struct gb_connection *connection); static inline bool gb_connection_is_static(struct gb_connection *connection) diff --git a/drivers/staging/greybus/legacy.c b/drivers/staging/greybus/legacy.c index 0f3dc8689fb4..c34764fc30b2 100644 --- a/drivers/staging/greybus/legacy.c +++ b/drivers/staging/greybus/legacy.c @@ -155,11 +155,12 @@ static int legacy_probe(struct gb_bundle *bundle, connection = gb_connection_create_dynamic(bundle->intf, bundle, - le16_to_cpu(cport_desc->id), - cport_desc->protocol_id); + le16_to_cpu(cport_desc->id)); if (!connection) goto err_connections_destroy; + connection->protocol_id = cport_desc->protocol_id; + data->connections[i] = connection; } -- 2.39.5