mm: Remove 'return;' at the end of void cma_activate_area()

[PATCH] mm: Remove 'return;' at the end of void cma_activate_area()

Posted by winterver 1 year, 2 months ago

From: Jiale Yang <295107659@qq.com>

Remove 'return;' at the end of void cma_activate_area(). It's a void
function, so an ending return statement is unnecessary.

Signed-off-by: Jiale Yang <295107659@qq.com>
---
 mm/cma.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mm/cma.c b/mm/cma.c
index 2d9fae939..070399bce 100644
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -135,7 +135,6 @@ static void __init cma_activate_area(struct cma *cma)
 	totalcma_pages -= cma->count;
 	cma->count = 0;
 	pr_err("CMA area %s could not be activated\n", cma->name);
-	return;
 }
 
 static int __init cma_init_reserved_areas(void)
-- 
2.43.0

Re: [PATCH] mm: Remove 'return;' at the end of void cma_activate_area()

Posted by SeongJae Park 1 year, 2 months ago

Hello,

On Tue, 19 Nov 2024 19:59:40 +0800 winterver <295107659@qq.com> wrote:

> From: Jiale Yang <295107659@qq.com>
> 
> Remove 'return;' at the end of void cma_activate_area(). It's a void
> function, so an ending return statement is unnecessary.
> 
> Signed-off-by: Jiale Yang <295107659@qq.com>
> ---
>  mm/cma.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/mm/cma.c b/mm/cma.c
> index 2d9fae939..070399bce 100644
> --- a/mm/cma.c
> +++ b/mm/cma.c
> @@ -135,7 +135,6 @@ static void __init cma_activate_area(struct cma *cma)
>  	totalcma_pages -= cma->count;
>  	cma->count = 0;
>  	pr_err("CMA area %s could not be activated\n", cma->name);
> -	return;
>  }

Looks good to me.  But, seems a same change[1] from Pintu Kumar has already
merged into mm-unstable?

[1] https://lore.kernel.org/20240927181637.19941-1-quic_pintu@quicinc.com


Thanks,
SJ

>  
>  static int __init cma_init_reserved_areas(void)
> -- 
> 2.43.0

Re: [PATCH] mm: Remove 'return;' at the end of void cma_activate_area()

Posted by Pintu Agarwal 1 year, 2 months ago

On Wed, 20 Nov 2024 at 00:43, SeongJae Park <sj@kernel.org> wrote:
>
> Hello,
>
> On Tue, 19 Nov 2024 19:59:40 +0800 winterver <295107659@qq.com> wrote:
>
> > From: Jiale Yang <295107659@qq.com>
> >
> > Remove 'return;' at the end of void cma_activate_area(). It's a void
> > function, so an ending return statement is unnecessary.
> >
> > Signed-off-by: Jiale Yang <295107659@qq.com>
> > ---
> >  mm/cma.c | 1 -
> >  1 file changed, 1 deletion(-)
> >
> > diff --git a/mm/cma.c b/mm/cma.c
> > index 2d9fae939..070399bce 100644
> > --- a/mm/cma.c
> > +++ b/mm/cma.c
> > @@ -135,7 +135,6 @@ static void __init cma_activate_area(struct cma *cma)
> >       totalcma_pages -= cma->count;
> >       cma->count = 0;
> >       pr_err("CMA area %s could not be activated\n", cma->name);
> > -     return;
> >  }
>
> Looks good to me.  But, seems a same change[1] from Pintu Kumar has already
> merged into mm-unstable?
>
> [1] https://lore.kernel.org/20240927181637.19941-1-quic_pintu@quicinc.com
>
Yes, this [1] is already part of linux-next now.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/commit/?h=next-20241118&id=1fa00a568d113db279f683f40636cf72cf73a55d

Re: [PATCH] mm: Remove 'return;' at the end of void cma_activate_area()

Posted by David Hildenbrand 1 year, 2 months ago

On 19.11.24 12:59, winterver wrote:
> From: Jiale Yang <295107659@qq.com>
> 
> Remove 'return;' at the end of void cma_activate_area(). It's a void
> function, so an ending return statement is unnecessary.
> 
> Signed-off-by: Jiale Yang <295107659@qq.com>
> ---
>   mm/cma.c | 1 -
>   1 file changed, 1 deletion(-)
> 
> diff --git a/mm/cma.c b/mm/cma.c
> index 2d9fae939..070399bce 100644
> --- a/mm/cma.c
> +++ b/mm/cma.c
> @@ -135,7 +135,6 @@ static void __init cma_activate_area(struct cma *cma)
>   	totalcma_pages -= cma->count;
>   	cma->count = 0;
>   	pr_err("CMA area %s could not be activated\n", cma->name);
> -	return;
>   }
>   
>   static int __init cma_init_reserved_areas(void)

Reviewed-by: David Hildenbrand <david@redhat.com>


-- 
Cheers,

David / dhildenb