Received-SPF: pass (google.com: domain of linux-kernel+bounces-184961-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
From: Nikolay Borisov <nik.borisov@suse.com>
To: x86@kernel.org
Cc: linux-kernel@vger.kernel.org,
	Nikolay Borisov <nik.borisov@suse.com>
Subject: [PATCH] x86/cpu: Consolidate identical branches
Date: Tue, 21 May 2024 15:48:32 +0300
Message-Id: <20240521124832.486390-1-nik.borisov@suse.com>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

It's pointless to have 2 identical branches one after the other, simply
collapse them in a single branch. No functional changes.

Signed-off-by: Nikolay Borisov <nik.borisov@suse.com>
---
 arch/x86/kernel/cpu/common.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 69265c0acaea..369037a166fd 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1732,12 +1732,11 @@ static void generic_identify(struct cpuinfo_x86 *c)
 {
 	c->extended_cpuid_level = 0;
 
-	if (!have_cpuid_p())
+	if (!have_cpuid_p()) {
 		identify_cpu_without_cpuid(c);
-
-	/* cyrix could have cpuid enabled via c_identify()*/
-	if (!have_cpuid_p())
+		/* cyrix could have cpuid enabled via c_identify()*/
 		return;
+	}
 
 	cpu_detect(c);
 
-- 
2.34.1