From 81fba24969c0ca427a8cd3d31bea10749f15b737 Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Tue, 19 Jan 2016 12:51:03 +0100 Subject: [PATCH] greybus: connection: always cancel operations on connection disable Always cancel all operations on connection disable and remove the now unused DESTROYING state. Reviewed-by: Viresh Kumar Signed-off-by: Johan Hovold Signed-off-by: Greg Kroah-Hartman --- drivers/staging/greybus/connection.c | 17 ++++++++--------- drivers/staging/greybus/connection.h | 1 - 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/staging/greybus/connection.c b/drivers/staging/greybus/connection.c index 3d7a9ca9ce2b..0fd7c051c2d3 100644 --- a/drivers/staging/greybus/connection.c +++ b/drivers/staging/greybus/connection.c @@ -426,12 +426,17 @@ EXPORT_SYMBOL_GPL(gb_connection_enable); void gb_connection_disable(struct gb_connection *connection) { + if (connection->state == GB_CONNECTION_STATE_DISABLED) + return; + gb_connection_control_disconnected(connection); spin_lock_irq(&connection->lock); connection->state = GB_CONNECTION_STATE_DISABLED; spin_unlock_irq(&connection->lock); + gb_connection_cancel_operations(connection, -ESHUTDOWN); + gb_connection_svc_connection_destroy(connection); gb_connection_hd_cport_disable(connection); } @@ -483,19 +488,13 @@ EXPORT_SYMBOL_GPL(gb_connection_legacy_init); void gb_connection_legacy_exit(struct gb_connection *connection) { - spin_lock_irq(&connection->lock); - if (connection->state != GB_CONNECTION_STATE_ENABLED) { - spin_unlock_irq(&connection->lock); + if (connection->state == GB_CONNECTION_STATE_DISABLED) return; - } - connection->state = GB_CONNECTION_STATE_DESTROYING; - spin_unlock_irq(&connection->lock); - - gb_connection_cancel_operations(connection, -ESHUTDOWN); - connection->protocol->connection_exit(connection); gb_connection_disable(connection); + connection->protocol->connection_exit(connection); + gb_connection_unbind_protocol(connection); } EXPORT_SYMBOL_GPL(gb_connection_legacy_exit); diff --git a/drivers/staging/greybus/connection.h b/drivers/staging/greybus/connection.h index ec0e46903819..b774b9c56744 100644 --- a/drivers/staging/greybus/connection.h +++ b/drivers/staging/greybus/connection.h @@ -17,7 +17,6 @@ enum gb_connection_state { GB_CONNECTION_STATE_INVALID = 0, GB_CONNECTION_STATE_DISABLED = 1, GB_CONNECTION_STATE_ENABLED = 2, - GB_CONNECTION_STATE_DESTROYING = 3, }; struct gb_operation;