2011-04-03 15:19:10

by Florian Mickler

Subject: [PATCH] x86, numa_64: remove unused variable

In case !CONFIG_ACPI_NUMA and !CONFIG_AMD_NUMA gcc emits a warning about
the unused variable ret.

As that variable is in fact not needed I choose to remove it.

Signed-off-by: Florian Mickler <[email protected]>
---
arch/x86/mm/numa_64.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index e8c00cc..0916976 100644
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -626,17 +626,13 @@ static int __init numa_init(int (*init_func)(void))

void __init initmem_init(void)
{
- int ret;
-
if (!numa_off) {
#ifdef CONFIG_ACPI_NUMA
- ret = numa_init(x86_acpi_numa_init);
- if (!ret)
+ if (!numa_init(x86_acpi_numa_init))
return;
#endif
#ifdef CONFIG_AMD_NUMA
- ret = numa_init(amd_numa_init);
- if (!ret)
+ if (!numa_init(amd_numa_init))
return;
#endif
}
--
1.7.4.1

2011-04-03 15:25:53

by Cyrill Gorcunov

Subject: Re: [PATCH] x86, numa_64: remove unused variable

On 04/03/2011 07:13 PM, Florian Mickler wrote:
> In case !CONFIG_ACPI_NUMA and !CONFIG_AMD_NUMA gcc emits a warning about
> the unused variable ret.
>
> As that variable is in fact not needed I choose to remove it.
>
> Signed-off-by: Florian Mickler <[email protected]>
> ---
> arch/x86/mm/numa_64.c | 8 ++------
> 1 files changed, 2 insertions(+), 6 deletions(-)
>

As far as I remember David prefer to have 'ret' in place but since it causes
such a warn we better to drop it.

--
Cyrill

2011-04-03 23:20:06

by Tejun Heo

Subject: Re: [PATCH] x86, numa_64: remove unused variable

On Sun, Apr 03, 2011 at 07:25:41PM +0400, Cyrill Gorcunov wrote:
> On 04/03/2011 07:13 PM, Florian Mickler wrote:
> > In case !CONFIG_ACPI_NUMA and !CONFIG_AMD_NUMA gcc emits a warning about
> > the unused variable ret.
> >
> > As that variable is in fact not needed I choose to remove it.
> >
> > Signed-off-by: Florian Mickler <[email protected]>
> > ---
> > arch/x86/mm/numa_64.c | 8 ++------
> > 1 files changed, 2 insertions(+), 6 deletions(-)
> >
>
> As far as I remember David prefer to have 'ret' in place but since it causes
> such a warn we better to drop it.

Applied to x86-mm. Thanks for the cc Cyrill.

--
tejun

2011-04-04 15:00:35

by Florian Mickler

Subject: [tip:x86/mm] x86-64, NUMA: Remove unused variable

Commit-ID: 711b8c87a5fe6de78e90411cb67b506babfef74a
Gitweb: http://git.kernel.org/tip/711b8c87a5fe6de78e90411cb67b506babfef74a
Author: Florian Mickler <[email protected]>
AuthorDate: Mon, 4 Apr 2011 01:17:40 +0200
Committer: Tejun Heo <[email protected]>
CommitDate: Mon, 4 Apr 2011 01:21:00 +0200

x86-64, NUMA: Remove unused variable

In case !CONFIG_ACPI_NUMA and !CONFIG_AMD_NUMA gcc emits a warning
about the unused variable ret.

As that variable is in fact not needed I choose to remove it.

Signed-off-by: Florian Mickler <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by: Tejun Heo <[email protected]>
---
arch/x86/mm/numa_64.c | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c
index 3951ee6..13f5b06 100644
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
@@ -505,17 +505,13 @@ static int __init numa_init(int (*init_func)(void))

void __init initmem_init(void)
{
- int ret;
-
if (!numa_off) {
#ifdef CONFIG_ACPI_NUMA
- ret = numa_init(x86_acpi_numa_init);
- if (!ret)
+ if (!numa_init(x86_acpi_numa_init))
return;
#endif
#ifdef CONFIG_AMD_NUMA
- ret = numa_init(amd_numa_init);
- if (!ret)
+ if (!numa_init(amd_numa_init))
return;
#endif
}

2011-04-05 03:29:54

by David Rientjes

Subject: Re: [PATCH] x86, numa_64: remove unused variable

On Sun, 3 Apr 2011, Florian Mickler wrote:

> In case !CONFIG_ACPI_NUMA and !CONFIG_AMD_NUMA gcc emits a warning about
> the unused variable ret.
>
> As that variable is in fact not needed I choose to remove it.
>
> Signed-off-by: Florian Mickler <[email protected]>

Acked-by: David Rientjes <[email protected]>