mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Florian Mickler <florian@mickler.org>
To: x86@kernel.org
Cc: Florian Mickler <florian@mickler.org>, linux-kernel@vger.kernel.org
Subject: [PATCH] x86, numa_64: remove unused variable
Date: Sun,  3 Apr 2011 17:13:34 +0200	[thread overview]
Message-ID: <1301843624-22364-1-git-send-email-florian@mickler.org> (raw)

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 <florian@mickler.org>
---
 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


             reply	other threads:[~2011-04-03 15:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-03 15:13 Florian Mickler [this message]
2011-04-03 15:25 ` Cyrill Gorcunov
2011-04-03 23:20   ` Tejun Heo
2011-04-04 15:00 ` [tip:x86/mm] x86-64, NUMA: Remove " tip-bot for Florian Mickler
2011-04-05  3:29 ` [PATCH] x86, numa_64: remove " David Rientjes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1301843624-22364-1-git-send-email-florian@mickler.org \
    --to=florian@mickler.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®