[RESEND PATCH] staging: android: Clean up binder_send_failed_reply

[Lucas Tanure]

Kernel coding style. Remove useless else statement after return.

Signed-off-by: Lucas Tanure <tan...@linux.com>
---
 drivers/staging/android/binder.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 14714a6..67c9847 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -1210,24 +1210,23 @@ static void binder_send_failed_reply(struct 
binder_transaction *t,
                                        target_thread->return_error);
                        }
                        return;
-               } else {
-                       struct binder_transaction *next = t->from_parent;
+               }
+               struct binder_transaction *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);
        }
 }
 
-- 
2.0.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/