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

greybus: connection: drop parent parameter from connection create 



The parent parameter was only used for debug messages and to name the
connection workqueue. Use the host-device device for this instead.

Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 2adaefb1

drivers/staging/greybus/connection.c

+4 −4
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ int svc_update_connection(struct gb_interface *intf, 
 */

struct gb_connection *

gb_connection_create_range(struct gb_host_device *hd,

			   struct gb_bundle *bundle, struct device *parent,

			   struct gb_bundle *bundle,

			   u16 cport_id, u8 protocol_id, u32 ida_start,

			   u32 ida_end)

{
@@ -152,7 +152,7 @@ gb_connection_create_range(struct gb_host_device *hd, 
	INIT_LIST_HEAD(&connection->operations);



	connection->wq = alloc_workqueue("%s:%d", WQ_UNBOUND, 1,

					 dev_name(parent), cport_id);

					 dev_name(&hd->dev), hd_cport_id);

	if (!connection->wq)

		goto err_free_connection;
@@ -170,7 +170,7 @@ gb_connection_create_range(struct gb_host_device *hd, 


	retval = gb_connection_bind_protocol(connection);

	if (retval) {

		dev_err(parent, "%d: failed to bind protocol: %d\n",

		dev_err(&hd->dev, "%d: failed to bind protocol: %d\n",

			cport_id, retval);

		gb_connection_destroy(connection);

		return NULL;
@@ -218,7 +218,7 @@ struct gb_connection *gb_connection_create(struct gb_bundle *bundle, 
				u16 cport_id, u8 protocol_id)

{

	return gb_connection_create_range(bundle->intf->hd, bundle,

					  &bundle->dev, cport_id, protocol_id,

					  cport_id, protocol_id,

					  0, bundle->intf->hd->num_cports);

}

drivers/staging/greybus/connection.h

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ int svc_update_connection(struct gb_interface *intf, 
struct gb_connection *gb_connection_create(struct gb_bundle *bundle,

				u16 cport_id, u8 protocol_id);

struct gb_connection *gb_connection_create_range(struct gb_host_device *hd,

			   struct gb_bundle *bundle, struct device *parent,

			   struct gb_bundle *bundle,

			   u16 cport_id, u8 protocol_id, u32 ida_start,

			   u32 ida_end);

void gb_connection_destroy(struct gb_connection *connection);

drivers/staging/greybus/interface.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ int gb_create_bundle_connection(struct gb_interface *intf, u8 class) 
	if (!bundle)

		return -EINVAL;



	if (!gb_connection_create_range(bundle->intf->hd, bundle, &bundle->dev,

	if (!gb_connection_create_range(bundle->intf->hd, bundle,

					cport_id, protocol_id, ida_start,

					ida_end))

		return -EINVAL;

drivers/staging/greybus/svc.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ gb_ap_svc_connection_create(struct gb_host_device *hd) 
{

	struct gb_connection *connection;



	connection = gb_connection_create_range(hd, NULL, &hd->dev,

	connection = gb_connection_create_range(hd, NULL,

						GB_SVC_CPORT_ID,

						GREYBUS_PROTOCOL_SVC,

						GB_SVC_CPORT_ID,