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 <toddpoy...@google.com>
---
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
_______________________________________________
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
