Skip to content

Commit b8fb574

Browse files
KarthikNayakYixun Lan
authored andcommitted
PD#146810: binder: backport changes from kernel-3.18 for android O (8.0)
Staging: Android: removed an unnecessary else statement As per checkpatch warning, removed an unnecessary else statement proceeding an if statement with a return. Change-Id: I28bb6b053916aa6fb0a80ec9b16e963b5531a23e Signed-off-by: Karthik Nayak <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> Signed-off-by: Yixun Lan <[email protected]>
1 parent 673c9d6 commit b8fb574

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

drivers/staging/android/binder.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -455,9 +455,8 @@ static size_t binder_buffer_size(struct binder_proc *proc,
455455
{
456456
if (list_is_last(&buffer->entry, &proc->buffers))
457457
return proc->buffer + proc->buffer_size - (void *)buffer->data;
458-
else
459-
return (size_t)list_entry(buffer->entry.next,
460-
struct binder_buffer, entry) - (size_t)buffer->data;
458+
return (size_t)list_entry(buffer->entry.next,
459+
struct binder_buffer, entry) - (size_t)buffer->data;
461460
}
462461

463462
static void binder_insert_free_buffer(struct binder_proc *proc,

0 commit comments

Comments
 (0)