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

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

[Nadim almas]

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

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

-- 
2.7.4

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

[Giedrius Statkevičius]

On Sun, Jul 31, 2016 at 6:44 PM, Nadim almas <nadim.902@gmail.com> wrote:
> This patch compresses two lines in to a single line in file
> ion.c
> if immediate return statement is found.It also removes variable
> ret as it is no longer needed.
>
> ne 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);
>  }

Try to actually compile before sending your patch.

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

[Nadim almas]

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

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

-- 
2.7.4

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

[Vaishali Thakkar]

On Tuesday 02 August 2016 11:43 PM, Nadim almas wrote:
> This patch compresses two lines in to a single line in file
> ion.c
> if immediate return statement is found.It also removes variable
> ret as it is no longer needed.
> 
> ne using script Coccinelle. And coccinelle uses following semantic
> patch for this compression function:

Ok, so there is some improvement [copy-pasted commit log->commit log for
the actual change] in commit log but there are some typos as well. Also,
like all other your previous patches subject line is missing some words.

For the commit log, subject line and patch version related things check
Documentation/SubmittingPatches . 

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

Like mentioned by Laura in previous version of the patch, you are not
supposed to send this patch in the kernel now. You can send the part of
a patch [may be ion_handle_put_nolock one] if it will apply after her
patches for the ion_phys.

Also, for this patch Joe's compile-testing and unused variable related
warning suggestion still applies. Please compile-test any patch before
sending it in to the mainline.

>  }
>  EXPORT_SYMBOL(ion_phys);
>  
> 

-- 
Vaishali

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

[Greg KH]

On Tue, Aug 02, 2016 at 11:13:20AM -0700, Nadim almas wrote:
> This patch compresses two lines in to a single line in file
> ion.c
> if immediate return statement is found.It also removes variable
> ret as it is no longer needed.
> 
> ne 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);

Patch is malformed and can not be applied :(