[PATCH] Staging: android: ion: fix coding style

[PATCH] Staging: android: ion: fix coding style

[Sorin Facaoaru]

- add line after declaration
- remove return statement in empty void function

Signed-off-by: Sorin Facaoaru <work@sorin.cc>
---
 drivers/staging/android/ion/ion.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 2703609..56604f4 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -805,6 +805,7 @@ struct ion_client *ion_client_create(struct ion_device *dev,
 						client, &debug_client_fops);
 	if (!client->debug_root) {
 		char buf[256], *path;
+
 		path = dentry_path(dev->clients_debug_root, buf, 256);
 		pr_err("Failed to create client debugfs at %s/%s\n",
 			path, client->display_name);
@@ -1056,7 +1057,6 @@ static void *ion_dma_buf_kmap(struct dma_buf *dmabuf, unsigned long offset)
 static void ion_dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long offset,
 			       void *ptr)
 {
-	return;
 }
 
 static int ion_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, size_t start,
-- 
1.9.1

[PATCH] Staging: android: ion: fix coding style

[Sorin Facaoaru]

- remove return statement in empty void function

Signed-off-by: Sorin Facaoaru <work@sorin.cc>
---
 drivers/staging/android/ion/ion_system_heap.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/android/ion/ion_system_heap.c b/drivers/staging/android/ion/ion_system_heap.c
index 6b77c51..da2a63c 100644
--- a/drivers/staging/android/ion/ion_system_heap.c
+++ b/drivers/staging/android/ion/ion_system_heap.c
@@ -205,7 +205,6 @@ static struct sg_table *ion_system_heap_map_dma(struct ion_heap *heap,
 static void ion_system_heap_unmap_dma(struct ion_heap *heap,
 				      struct ion_buffer *buffer)
 {
-	return;
 }
 
 static int ion_system_heap_shrink(struct ion_heap *heap, gfp_t gfp_mask,
-- 
1.9.1

[PATCH] Staging: android: ion: fix coding style

[Sorin Facaoaru]

- remove return statement in void function

Signed-off-by: Sorin Facaoaru <work@sorin.cc>
---
 drivers/staging/android/ion/ion_dummy_driver.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/staging/android/ion/ion_dummy_driver.c b/drivers/staging/android/ion/ion_dummy_driver.c
index 3a45e79..ce606bd 100644
--- a/drivers/staging/android/ion/ion_dummy_driver.c
+++ b/drivers/staging/android/ion/ion_dummy_driver.c
@@ -152,7 +152,5 @@ static void __exit ion_dummy_exit(void)
 				dummy_heaps[ION_HEAP_TYPE_CHUNK].size);
 		chunk_ptr = NULL;
 	}
-
-	return;
 }
 __exitcall(ion_dummy_exit);
-- 
1.9.1

[PATCH] Staging: android: ion: fix coding style

[Sorin Facaoaru]

- remove return statement in empty void function

Signed-off-by: Sorin Facaoaru <work@sorin.cc>
---
 drivers/staging/android/ion/ion_chunk_heap.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/android/ion/ion_chunk_heap.c b/drivers/staging/android/ion/ion_chunk_heap.c
index 9c3e49a..3e6ec2e 100644
--- a/drivers/staging/android/ion/ion_chunk_heap.c
+++ b/drivers/staging/android/ion/ion_chunk_heap.c
@@ -126,7 +126,6 @@ static struct sg_table *ion_chunk_heap_map_dma(struct ion_heap *heap,
 static void ion_chunk_heap_unmap_dma(struct ion_heap *heap,
 				     struct ion_buffer *buffer)
 {
-	return;
 }
 
 static struct ion_heap_ops chunk_heap_ops = {
-- 
1.9.1

[PATCH] Staging: android: ion: fix coding style

[Sorin Facaoaru]

- remove return statement in empty void function

Signed-off-by: Sorin Facaoaru <work@sorin.cc>
---
 drivers/staging/android/ion/ion_carveout_heap.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/android/ion/ion_carveout_heap.c b/drivers/staging/android/ion/ion_carveout_heap.c
index dcb6f21..9156d82 100644
--- a/drivers/staging/android/ion/ion_carveout_heap.c
+++ b/drivers/staging/android/ion/ion_carveout_heap.c
@@ -133,7 +133,6 @@ static struct sg_table *ion_carveout_heap_map_dma(struct ion_heap *heap,
 static void ion_carveout_heap_unmap_dma(struct ion_heap *heap,
 					struct ion_buffer *buffer)
 {
-	return;
 }
 
 static struct ion_heap_ops carveout_heap_ops = {
-- 
1.9.1

[PATCH] Staging: android: ion: fix coding style

[Sorin Facaoaru]

- add line after declaration 
- remove return statement in empty void function

Signed-off-by: Sorin Facaoaru <work@sorin.cc> 
---
 drivers/staging/android/ion/ion.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 2703609..56604f4 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -805,6 +805,7 @@ struct ion_client *ion_client_create(struct ion_device *dev,
 						client, &debug_client_fops);
 	if (!client->debug_root) {
 		char buf[256], *path;
+
 		path = dentry_path(dev->clients_debug_root, buf, 256);
 		pr_err("Failed to create client debugfs at %s/%s\n",
 			path, client->display_name);
@@ -1056,7 +1057,6 @@ static void *ion_dma_buf_kmap(struct dma_buf *dmabuf, unsigned long offset)
 static void ion_dma_buf_kunmap(struct dma_buf *dmabuf, unsigned long offset,
 			       void *ptr)
 {
-	return;
 }
 
 static int ion_dma_buf_begin_cpu_access(struct dma_buf *dmabuf, size_t start,
-- 
1.9.1

Re: [PATCH] Staging: android: ion: fix coding style

[Greg KH]

First off, thanks for the patches.

But, they need some tweaks before I can accept them.

You sent a bunch of patches, all with the same exact subject, with no
hint of which order they should be applied in, or what exactly they do.


On Sat, Sep 13, 2014 at 04:46:10PM -0700, Sorin Facaoaru wrote:
> - add line after declaration 
> - remove return statement in empty void function

For this patch, you are doing two different things, in the same file,
that should be two different patches.  But you might be able to merge
them with your other patches.

Make your patches do "just one thing" from a logical point of view.

For example, you could have a patch titled:
	[PATCH 01/05] staging: android: ion: remove unneeded returns

that just removed the unneeded return statemnents for all of the ion
files.

Then 4 other patches that do 4 other "logical" things, telling me what
order to apply them in.

Can you please fix up all of your recent submissions and resend in that
format?

> Signed-off-by: Sorin Facaoaru <work@sorin.cc> 

You have trailing whitespace here :(

thanks,

greg k-h