Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1452567 > unrolled thread

[PATCH 33/33] Staging: android: ion: ion.c: Compression of lines for

Back to article view | Back to linux.kernel

Contents

  [PATCH 33/33] Staging: android: ion: ion.c: Compression of lines for Nadim almas <nadim.902@gmail.com> - 2016-07-29 23:10 +0200
    Re: [PATCH 33/33] Staging: android: ion: ion.c: Compression of  lines for Joe Perches <joe@perches.com> - 2016-07-29 23:20 +0200

#1452567 — [PATCH 33/33] Staging: android: ion: ion.c: Compression of lines for

This patch compresses two lines in to a single line in file rtw_android.c
if immediate return statement is found. It also removes variable 
bytes_written as it is no longer needed.

It is done using script Coccinelle. And coccinelle uses following semantic
patch for this compression function:


@@
expression e, ret;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: Nadim Almas <nadim.902@gmail.com>
---
 drivers/staging/android/ion/ion.c          | 8 +++-----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 52345df..271395b 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -391,9 +391,7 @@ static int ion_handle_put_nolock(struct ion_handle *handle)
 {
 	int ret;
 
-	ret = kref_put(&handle->ref, ion_handle_destroy);
-
-	return ret;
+        return kref_put(&handle->ref, ion_handle_destroy);
 }
 
 static int ion_handle_put(struct ion_handle *handle)
@@ -597,8 +595,8 @@ int ion_phys(struct ion_client *client, struct ion_handle *handle,
 		return -ENODEV;
 	}
 	mutex_unlock(&client->lock);
-	ret = buffer->heap->ops->phys(buffer->heap, buffer, addr, len);
-	return ret;
+	
+        return buffer->heap->ops->phys(buffer->heap, buffer, addr, len);
 }
 EXPORT_SYMBOL(ion_phys);
 

[toc] | [next] | [standalone]

#1452572 — Re: [PATCH 33/33] Staging: android: ion: ion.c: Compression of lines for

On Fri, 2016-07-29 at 14:06 -0700, Nadim almas wrote:
> This patch compresses two lines in to a single line in file rtw_android.c
> if immediate return statement is found. It also removes variable 
> bytes_written as it is no longer needed.
> 
> It is done using script Coccinelle. And coccinelle uses following semantic
> patch for this compression function:
[]
> diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
[]
> @@ -391,9 +391,7 @@ static int ion_handle_put_nolock(struct ion_handle *handle)
>  {
>  	int ret;
>  
> -	ret = kref_put(&handle->ref, ion_handle_destroy);
> -
> -	return ret;
> +        return kref_put(&handle->ref, ion_handle_destroy);
>  }

int ret; is now unused.

Please make sure you compile the files modified by any script
and remove any newly introduced warnings.


>  static int ion_handle_put(struct ion_handle *handle)
> @@ -597,8 +595,8 @@ int ion_phys(struct ion_client *client, struct ion_handle *handle,
>  		return -ENODEV;
>  	}
>  	mutex_unlock(&client->lock);
> -	ret = buffer->heap->ops->phys(buffer->heap, buffer, addr, len);
> -	return ret;
> +	
> +        return buffer->heap->ops->phys(buffer->heap, buffer, addr, len);
>  }
>  EXPORT_SYMBOL(ion_phys);

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web