diff options
author | Johan Hovold <johan@hovoldconsulting.com> | 2016-01-21 17:34:11 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@google.com> | 2016-01-21 22:45:09 -0800 |
commit | bafe3f67908c68a0b1fdc527c79cd7d9106abd85 (patch) | |
tree | 578c1272be171d92f90cd9aac4e8b04c7860f150 | |
parent | d6fba3dbb04dac64cf7fa6d33ea7fce81ecf862c (diff) | |
download | linux-stable-bafe3f67908c68a0b1fdc527c79cd7d9106abd85.tar.gz linux-stable-bafe3f67908c68a0b1fdc527c79cd7d9106abd85.tar.bz2 linux-stable-bafe3f67908c68a0b1fdc527c79cd7d9106abd85.zip |
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>
-rw-r--r-- | drivers/staging/greybus/connection.c | 6 | ||||
-rw-r--r-- | drivers/staging/greybus/connection.h | 2 | ||||
-rw-r--r-- | drivers/staging/greybus/svc.c | 3 |
3 files changed, 4 insertions, 7 deletions
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; |