[PATCH v4] staging: android: Clean up else statement from binder_send_failed_reply

[PATCH v4] staging: android: Clean up else statement from binder_send_failed_reply

[Lucas Tanure]

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>
---
 drivers/staging/android/binder.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index 14714a6..4f34dc0 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -1183,6 +1183,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) {
@@ -1210,24 +1211,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);
 	}
 }
 
-- 
2.0.1

Re: [PATCH v4] staging: android: Clean up else statement from binder_send_failed_reply

[Lucas Tanure]

Hi,

This patch got accepted ?

Thanks
--
Lucas Tanure
+55 (19) 988176559


On Sun, Jul 13, 2014 at 9:31 PM, Lucas Tanure <tanure@linux.com> wrote:
> 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>
> ---
>  drivers/staging/android/binder.c | 28 ++++++++++++++--------------
>  1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
> index 14714a6..4f34dc0 100644
> --- a/drivers/staging/android/binder.c
> +++ b/drivers/staging/android/binder.c
> @@ -1183,6 +1183,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) {
> @@ -1210,24 +1211,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);
>         }
>  }
>
> --
> 2.0.1
>

Re: [PATCH v4] staging: android: Clean up else statement from binder_send_failed_reply

[Dan Carpenter]

On Mon, Jul 14, 2014 at 04:38:43PM -0300, Lucas Tanure wrote:
> Hi,
> 
> This patch got accepted ?
>

It looks ok.  You will get an automated email when the patch is merged
into Greg's tree.  It can take 2 weeks or longer depending on merge
window timing or Greg's travel schedule.

Anyway, your patch is not lost.  Email again in 2 weeks if you haven't
heard anything.

regards,
dan carpenter