From 3afe952127e6379b32ba0d845231dbe952d6117b Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Thu, 17 Sep 2015 13:17:27 +0200 Subject: [PATCH] greybus: hd: remove connection-create/destroy callbacks These host-driver callbacks were intended to allow host drivers to prepare a cport, something which can now be handled by the cport enable/disable callbacks instead. The current create/destroy are somewhat confusingly named as they were not supposed to create or destroy connections. They were however called from the unrelated helper functions that do create and destroy SVC connections. Furthermore, no errors were returned should the create callback fail, which should have caused the connection initialisation to fail. Remove these unused callbacks for now, and let us use the cport enable/disable callbacks that should be able handle all host cport initialisation (possibly after also adding an interface to provide information for endpoint-cport mapping). Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/connection.c | 6 ------ drivers/staging/greybus/greybus.h | 2 -- 2 files changed, 8 deletions(-) diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c index b4947f01d22b..f1541312fcc5 100644 --- a/drivers/staging/greybus/connection.c +++ b/drivers/staging/greybus/connection.c @@ -374,9 +374,6 @@ gb_connection_svc_connection_create(struct gb_connection *connection) return ret; } - if (hd->driver->connection_create) - hd->driver->connection_create(connection); - return 0; } @@ -386,9 +383,6 @@ gb_connection_svc_connection_destroy(struct gb_connection *connection) if (connection->protocol->flags & GB_PROTOCOL_SKIP_SVC_CONNECTION) return; - if (connection->hd->driver->connection_destroy) - connection->hd->driver->connection_destroy(connection); - gb_svc_connection_destroy(connection->hd->svc, connection->hd->endo->ap_intf_id, connection->hd_cport_id, diff --git a/drivers/staging/greybus/greybus.h b/drivers/staging/greybus/greybus.h index a320d58a219a..e4e53c139ac4 100644 --- a/drivers/staging/greybus/greybus.h +++ b/drivers/staging/greybus/greybus.h @@ -77,8 +77,6 @@ struct greybus_host_driver { int (*cport_enable)(struct greybus_host_device *hd, u16 cport_id); int (*cport_disable)(struct greybus_host_device *hd, u16 cport_id); - void (*connection_create)(struct gb_connection *connection); - void (*connection_destroy)(struct gb_connection *connection); int (*message_send)(struct greybus_host_device *hd, u16 dest_cport_id, struct gb_message *message, gfp_t gfp_mask); void (*message_cancel)(struct gb_message *message); -- 2.20.1