2014-07-13 14:14:33

by Lucas Tanure

Subject: [PATCH] staging: android: Clean up binder_send_failed_reply

Kernel coding style. Remove useless else statement after return.

Signed-off-by: Lucas Tanure <[email protected]>
---
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..eee80fb 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

2014-07-14 08:22:43

by Dan Carpenter

Subject: Re: [PATCH] staging: android: Clean up binder_send_failed_reply

On Sun, Jul 13, 2014 at 11:08:34AM -0300, Lucas Tanure wrote:
> Kernel coding style. Remove useless else statement after return.
>

You introduce a GCC warning.

drivers/staging/android/binder.c: In function ‘binder_send_failed_reply’:
drivers/staging/android/binder.c:1217:3: warning: ISO C90 forbids mixed declarations and code [-Wdeclaration-after-statement]

regards,
dan carpenter