瀏覽代碼

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 <toddpoynor@google.com>
Acked-by: Sumit Semwal <sumit.semwal@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Todd Poynor 7 年之前
父節點
當前提交
7954c88408
共有 1 個文件被更改,包括 2 次插入4 次删除
  1. 2 4
      drivers/staging/android/ion/ion.c

+ 2 - 4
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->heap = heap;
 	buffer->flags = flags;
 	buffer->flags = flags;
+	buffer->dev = dev;
+	buffer->size = len;
 
 
 	ret = heap->ops->allocate(heap, buffer, len, flags);
 	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;
 		goto err1;
 	}
 	}
 
 
-	buffer->dev = dev;
-	buffer->size = len;
 
 
-	buffer->dev = dev;
-	buffer->size = len;
 	INIT_LIST_HEAD(&buffer->attachments);
 	INIT_LIST_HEAD(&buffer->attachments);
 	mutex_init(&buffer->lock);
 	mutex_init(&buffer->lock);
 	mutex_lock(&dev->buffer_lock);
 	mutex_lock(&dev->buffer_lock);