staging: android: Clean up else statement from binder_send_failed_reply

Kernel coding style. Remove useless else statement after return.

Changes from v1 and v2: Fix warning for mixed declarations and code.
Declaration of "struct binder_transaction *next" made outside of while.

Changes from v3: Removed initialization to NULL for next variable.

Signed-off-by: Lucas Tanure <tanure@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index e446f624a04ec0b3fe11346868e4c8e586393e95..02b0379ae5501ec563cff1647ac817b9b61440d8 100644 (file)
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -1185,6 +1185,7 @@ static void binder_send_failed_reply(struct binder_transaction *t,
                                     uint32_t error_code)
 {
        struct binder_thread *target_thread;
+       struct binder_transaction *next;
 
        BUG_ON(t->flags & TF_ONE_WAY);
        while (1) {
@@ -1212,24 +1213,23 @@ static void binder_send_failed_reply(struct binder_transaction *t,
                                        target_thread->return_error);
                        }
                        return;
-               } else {
-                       struct binder_transaction *next = t->from_parent;
+               }
+               next = t->from_parent;
 
-                       binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,
-                                    "send failed reply for transaction %d, target dead\n",
-                                    t->debug_id);
+               binder_debug(BINDER_DEBUG_FAILED_TRANSACTION,
+                            "send failed reply for transaction %d, target dead\n",
+                            t->debug_id);
 
-                       binder_pop_transaction(target_thread, t);
-                       if (next == NULL) {
-                               binder_debug(BINDER_DEBUG_DEAD_BINDER,
-                                            "reply failed, no target thread at root\n");
-                               return;
-                       }
-                       t = next;
+               binder_pop_transaction(target_thread, t);
+               if (next == NULL) {
                        binder_debug(BINDER_DEBUG_DEAD_BINDER,
-                                    "reply failed, no target thread -- retry %d\n",
-                                     t->debug_id);
+                                    "reply failed, no target thread at root\n");
+                       return;
                }
+               t = next;
+               binder_debug(BINDER_DEBUG_DEAD_BINDER,
+                            "reply failed, no target thread -- retry %d\n",
+                             t->debug_id);
        }
 }