Re: [PATCH 1/2] staging: android: ion: Remove dead code in ion_page_pool_free

[Yisheng Xie]

Hi Greg,

JFYI, I have rebase this patchset to v4.15-rc1.[1]

[1] https://lkml.org/lkml/2018/2/12/204

Thanks
Yisheng

On 2018/2/5 11:26, Yisheng Xie wrote:
> ion_page_pool_add will always return 0, however ion_page_pool_free will
> call ion_page_pool_free_pages when ion_page_pool_add's return value is
> not 0, so it is a dead code which can be removed.
> 
> Signed-off-by: Yisheng Xie 
> ---
>  drivers/staging/android/ion/ion_page_pool.c | 6 +-
>  1 file changed, 1 insertion(+), 5 deletions(-)
> 
> diff --git a/drivers/staging/android/ion/ion_page_pool.c 
> b/drivers/staging/android/ion/ion_page_pool.c
> index 4452e28..150626f 100644
> --- a/drivers/staging/android/ion/ion_page_pool.c
> +++ b/drivers/staging/android/ion/ion_page_pool.c
> @@ -79,13 +79,9 @@ struct page *ion_page_pool_alloc(struct ion_page_pool 
> *pool)
>  
>  void ion_page_pool_free(struct ion_page_pool *pool, struct page *page)
>  {
> - int ret;
> -
>   BUG_ON(pool->order != compound_order(page));
>  
> - ret = ion_page_pool_add(pool, page);
> - if (ret)
> - ion_page_pool_free_pages(pool, page);
> + ion_page_pool_add(pool, page);
>  }
>  
>  static int ion_page_pool_total(struct ion_page_pool *pool, bool high)
> 

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 1/2] staging: android: ion: Remove dead code in ion_page_pool_free

[Yisheng Xie]

Hi Laura,

On 2018/2/7 7:11, Laura Abbott wrote:
> On 02/06/2018 03:10 PM, Laura Abbott wrote:
>> On 02/04/2018 07:26 PM, Yisheng Xie wrote:
>>> ion_page_pool_add will always return 0, however ion_page_pool_free will
>>> call ion_page_pool_free_pages when ion_page_pool_add's return value is
>>> not 0, so it is a dead code which can be removed.
>>>
>>
>> Can you clean up ion_page_pool_add to be a void return as well?
>> No sense in having it just always return 0.
>>
> 
> Nevermind, just saw the follow up patch. Both of them:
> 
> Acked-by: Laura Abbott 

Thanks.
If you do not mind, I will send out another two cleanup patchs:
cleanup ion_page_pool_alloc_pages() and combine cache/uncache pools into one 
pools.

Thanks

> 
>>> Signed-off-by: Yisheng Xie 
>>> ---
>>>   drivers/staging/android/ion/ion_page_pool.c | 6 +-
>>>   1 file changed, 1 insertion(+), 5 deletions(-)
>>>
>>> diff --git a/drivers/staging/android/ion/ion_page_pool.c 
>>> b/drivers/staging/android/ion/ion_page_pool.c
>>> index 4452e28..150626f 100644
>>> --- a/drivers/staging/android/ion/ion_page_pool.c
>>> +++ b/drivers/staging/android/ion/ion_page_pool.c
>>> @@ -79,13 +79,9 @@ struct page *ion_page_pool_alloc(struct ion_page_pool 
>>> *pool)
>>>   void ion_page_pool_free(struct ion_page_pool *pool, struct page *page)
>>>   {
>>> -int ret;
>>> -
>>>   BUG_ON(pool->order != compound_order(page));
>>> -ret = ion_page_pool_add(pool, page);
>>> -if (ret)
>>> -ion_page_pool_free_pages(pool, page);
>>> +ion_page_pool_add(pool, page);
>>>   }
>>>   static int ion_page_pool_total(struct ion_page_pool *pool, bool high)
>>>
>>
> 
> 
> 

___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 1/2] staging: android: ion: Remove dead code in ion_page_pool_free

[Laura Abbott]

On 02/06/2018 03:10 PM, Laura Abbott wrote:

On 02/04/2018 07:26 PM, Yisheng Xie wrote:

ion_page_pool_add will always return 0, however ion_page_pool_free will
call ion_page_pool_free_pages when ion_page_pool_add's return value is
not 0, so it is a dead code which can be removed.



Can you clean up ion_page_pool_add to be a void return as well?
No sense in having it just always return 0.



Nevermind, just saw the follow up patch. Both of them:

Acked-by: Laura Abbott 


Signed-off-by: Yisheng Xie 
---
  drivers/staging/android/ion/ion_page_pool.c | 6 +-
  1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/android/ion/ion_page_pool.c 
b/drivers/staging/android/ion/ion_page_pool.c
index 4452e28..150626f 100644
--- a/drivers/staging/android/ion/ion_page_pool.c
+++ b/drivers/staging/android/ion/ion_page_pool.c
@@ -79,13 +79,9 @@ struct page *ion_page_pool_alloc(struct ion_page_pool *pool)
  void ion_page_pool_free(struct ion_page_pool *pool, struct page *page)
  {
-    int ret;
-
  BUG_ON(pool->order != compound_order(page));
-    ret = ion_page_pool_add(pool, page);
-    if (ret)
-    ion_page_pool_free_pages(pool, page);
+    ion_page_pool_add(pool, page);
  }
  static int ion_page_pool_total(struct ion_page_pool *pool, bool high)





___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel

Re: [PATCH 1/2] staging: android: ion: Remove dead code in ion_page_pool_free

[Laura Abbott]

On 02/04/2018 07:26 PM, Yisheng Xie wrote:

ion_page_pool_add will always return 0, however ion_page_pool_free will
call ion_page_pool_free_pages when ion_page_pool_add's return value is
not 0, so it is a dead code which can be removed.



Can you clean up ion_page_pool_add to be a void return as well?
No sense in having it just always return 0.


Signed-off-by: Yisheng Xie 
---
  drivers/staging/android/ion/ion_page_pool.c | 6 +-
  1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/staging/android/ion/ion_page_pool.c 
b/drivers/staging/android/ion/ion_page_pool.c
index 4452e28..150626f 100644
--- a/drivers/staging/android/ion/ion_page_pool.c
+++ b/drivers/staging/android/ion/ion_page_pool.c
@@ -79,13 +79,9 @@ struct page *ion_page_pool_alloc(struct ion_page_pool *pool)
  
  void ion_page_pool_free(struct ion_page_pool *pool, struct page *page)

  {
-   int ret;
-
BUG_ON(pool->order != compound_order(page));
  
-	ret = ion_page_pool_add(pool, page);

-   if (ret)
-   ion_page_pool_free_pages(pool, page);
+   ion_page_pool_add(pool, page);
  }
  
  static int ion_page_pool_total(struct ion_page_pool *pool, bool high)




___
devel mailing list
de...@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel