Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bafe3f67 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: connection: drop protocol parameter from static interface 



Drop legacy protocol parameter from static connection interface.

Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent d6fba3db

drivers/staging/greybus/connection.c

+2 −4
Original line number Diff line number Diff line
@@ -217,11 +217,9 @@ gb_connection_create(struct gb_host_device *hd, int hd_cport_id, 
}



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 *

drivers/staging/greybus/connection.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/staging/greybus/svc.c

+1 −2
Original line number Diff line number Diff line
@@ -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;