2014-07-13 23:25:27

by Lucas Tanure

Subject: [PATCH v3] 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,
and initialized with NULL.

Signed-off-by: Lucas Tanure <[email protected]>
---
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..574f529 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 = NULL;

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

2014-07-14 00:08:43

by Greg Kroah-Hartman

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

On Sun, Jul 13, 2014 at 08:25:13PM -0300, Lucas Tanure 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,
> and initialized with NULL.

Why did you initialize it with NULL? It's not needed to do this, right?

4th time's a charm?

thanks,

greg k-h

2014-07-14 00:36:06

by Lucas Tanure

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

Ok. I will do it.
4th could be the right one =p.

Thanks for your time
Cheers

--
Lucas Tanure
+55 (19) 988176559


On Sun, Jul 13, 2014 at 9:13 PM, Greg Kroah-Hartman
<[email protected]> wrote:
> On Sun, Jul 13, 2014 at 08:25:13PM -0300, Lucas Tanure 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,
>> and initialized with NULL.
>
> Why did you initialize it with NULL? It's not needed to do this, right?
>
> 4th time's a charm?
>
> thanks,
>
> greg k-h

2014-07-14 08:44:18

by Dan Carpenter

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

On Sun, Jul 13, 2014 at 08:25:13PM -0300, Lucas Tanure 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,
> and initialized with NULL.

Don't initialize it at all. It just disables GCC's builtin warning
for using unitialized variables.

regards,
dan carpenter