]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
greybus: connection: Fix sparse warnings around locking
authorViresh Kumar <viresh.kumar@linaro.org>
Thu, 28 Jan 2016 10:20:48 +0000 (15:50 +0530)
committerGreg Kroah-Hartman <gregkh@google.com>
Wed, 3 Feb 2016 05:37:50 +0000 (21:37 -0800)
The callers ensures that connection->lock is taken before calling few
routines, but that isn't enough for sparse as it sees an unexpected
unlock.

greybus/connection.c:380:29: warning: context imbalance in 'gb_connection_cancel_operations' - unexpected unlock

Fix that adding __must_lock() attribute to the function declaration.

This also adds the attribute for
gb_connection_flush_incoming_operations(), which isn't showing any
sparse warnings with the current state of code, but with minor
rearrangements of the code.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Reviewed-by: Alex Elder <elder@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/connection.c

index 77c2f672b4050bab7f4f78747b80c68a3df7c966..4f5e2adfa8c4eb6c1232f66b9dadf9358f2aa2fc 100644 (file)
@@ -373,6 +373,7 @@ gb_connection_control_disconnected(struct gb_connection *connection)
  */
 static void gb_connection_cancel_operations(struct gb_connection *connection,
                                                int errno)
+       __must_hold(&connection->lock)
 {
        struct gb_operation *operation;
 
@@ -401,6 +402,7 @@ static void gb_connection_cancel_operations(struct gb_connection *connection,
 static void
 gb_connection_flush_incoming_operations(struct gb_connection *connection,
                                                int errno)
+       __must_hold(&connection->lock)
 {
        struct gb_operation *operation;
        bool incoming;