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

Markus Böhme markus.boehme at mailbox.org
Sat Jul 30 15:26:08 UTC 2016


On 07/30/2016 01:12 PM, 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.

This commit message is wrong. Neither are you editing rtw_android.c, nor
are you doing anything to a variable named bytes_written. Additionally,
the short description in your first line/subject seems to be missing a
word or two at the end.

> 
> 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 at 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);

What Joe told you about compile-testing, warnings and unused variables
still applies.


More information about the devel mailing list