Skip to contentSkip to conversation

staging: android: Clean up binder_send_failed_reply

PATCH Superseded Lucas Tanure 2 participants 2 messages Jul 13, 2014 – Jul 14, 2014 Staging

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: android: Clean up binder_send_failed_reply

Kernel coding style. Remove useless else statement after return.

---
 drivers/staging/android/binder.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
drivers/staging/android/binder.c +13 -14
index 14714a6..eee80fb 100644
@@ -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);
 	}
 }
 
Signature · 1 line
2.0.1
#1 lore raw
Quoted 2 lines · Lucas Tanure

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