2018-04-21 03:13:56

by Todd Poynor

[permalink] [raw]
Subject: [PATCH] staging: android: ion: remove duplicate buffer field initializes

As a result of various previous patches, ion_buffer_create() now
has two sets of identical statements for initializing two fields of
the buffer struct, next to each other. Remove one set.

Move the initialization of these two fields together with the
statements that initialize the other two fields from the function
parameters, prior to the heap allocate() call, for consistency.

Signed-off-by: Todd Poynor <[email protected]>
---
drivers/staging/android/ion/ion.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index e74db7902549..269a431646be 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -74,6 +74,8 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,

buffer->heap = heap;
buffer->flags = flags;
+ buffer->dev = dev;
+ buffer->size = len;

ret = heap->ops->allocate(heap, buffer, len, flags);

@@ -93,11 +95,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
goto err1;
}

- buffer->dev = dev;
- buffer->size = len;

- buffer->dev = dev;
- buffer->size = len;
INIT_LIST_HEAD(&buffer->attachments);
mutex_init(&buffer->lock);
mutex_lock(&dev->buffer_lock);
--
2.17.0.484.g0c8726318c-goog



2018-04-23 12:27:40

by Sumit Semwal

[permalink] [raw]
Subject: Re: [PATCH] staging: android: ion: remove duplicate buffer field initializes

Hello Todd,

Thanks for the patch.

On 21 April 2018 at 08:26, Todd Poynor <[email protected]> wrote:
> As a result of various previous patches, ion_buffer_create() now
> has two sets of identical statements for initializing two fields of
> the buffer struct, next to each other. Remove one set.
>
> Move the initialization of these two fields together with the
> statements that initialize the other two fields from the function
> parameters, prior to the heap allocate() call, for consistency.
>
> Signed-off-by: Todd Poynor <[email protected]>

Acked-by: Sumit Semwal <[email protected]>

> ---
> drivers/staging/android/ion/ion.c | 6 ++----
> 1 file changed, 2 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
> index e74db7902549..269a431646be 100644
> --- a/drivers/staging/android/ion/ion.c
> +++ b/drivers/staging/android/ion/ion.c
> @@ -74,6 +74,8 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
>
> buffer->heap = heap;
> buffer->flags = flags;
> + buffer->dev = dev;
> + buffer->size = len;
>
> ret = heap->ops->allocate(heap, buffer, len, flags);
>
> @@ -93,11 +95,7 @@ static struct ion_buffer *ion_buffer_create(struct ion_heap *heap,
> goto err1;
> }
>
> - buffer->dev = dev;
> - buffer->size = len;
>
> - buffer->dev = dev;
> - buffer->size = len;
> INIT_LIST_HEAD(&buffer->attachments);
> mutex_init(&buffer->lock);
> mutex_lock(&dev->buffer_lock);
> --
> 2.17.0.484.g0c8726318c-goog
>


Best,
Sumit.