Commit 81fba249 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

greybus: connection: always cancel operations on connection disable 



Always cancel all operations on connection disable and remove the now
unused DESTROYING state.

Reviewed-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan@hovoldconsulting.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent bfa9a5e2

drivers/staging/greybus/connection.c

+8 −9
Original line number Diff line number Diff line
@@ -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);

drivers/staging/greybus/connection.h

+0 −1
Original line number Diff line number Diff line
@@ -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;