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: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>

diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c
index c076171cba7a6bbc9d8845f10ba3bed1443e1e94..cca52934ce377388b26507b94a4318a2130bbb1b 100644 (file)
--- a/drivers/staging/greybus/connection.c
+++ b/drivers/staging/greybus/connection.c
@@ -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);
 }
 

diff --git a/drivers/staging/greybus/connection.h b/drivers/staging/greybus/connection.h
index 6163082309c65eb54cf5182515ed83b2094e0a06..44ecfbed1d0de04a3c30114dbe68f7ea086a9840 100644 (file)
--- a/drivers/staging/greybus/connection.h
+++ b/drivers/staging/greybus/connection.h
@@ -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);

diff --git a/drivers/staging/greybus/interface.c b/drivers/staging/greybus/interface.c
index 4c99e3e9b0f535e8fe96ae9efa9477db2f8c9221..1b13d3791b28d85bc71564880b0c847493a10620 100644 (file)
--- a/drivers/staging/greybus/interface.c
+++ b/drivers/staging/greybus/interface.c
@@ -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;

diff --git a/drivers/staging/greybus/svc.c b/drivers/staging/greybus/svc.c
index 7425c4980c38f7da6c722c568d27e3a58c5b9a8e..79941583858b26e727dde0f49972843fea262b3b 100644 (file)
--- a/drivers/staging/greybus/svc.c
+++ b/drivers/staging/greybus/svc.c
@@ -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,