diff options
| -rw-r--r-- | drivers/staging/greybus/connection.c | 8 | ||||
| -rw-r--r-- | drivers/staging/greybus/connection.h | 2 | ||||
| -rw-r--r-- | drivers/staging/greybus/interface.c | 2 | ||||
| -rw-r--r-- | drivers/staging/greybus/svc.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c index c076171cba7a..cca52934ce37 100644 --- 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 6163082309c6..44ecfbed1d0d 100644 --- 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 4c99e3e9b0f5..1b13d3791b28 100644 --- 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 7425c4980c38..79941583858b 100644 --- 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, |