public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: "tip-bot for Figo.zhang" <figo1802@gmail.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
	figo1802@gmail.com, dmitry.adamushko@gmail.com,
	tglx@linutronix.de, mingo@elte.hu
Subject: [tip:x86/microcode] x86, microcode: Simplify vfree() use
Date: Sun, 7 Jun 2009 14:42:44 GMT	[thread overview]
Message-ID: <tip-aeef50bc0483fa70ce0bddb686ec84a274b7f3d4@git.kernel.org> (raw)
In-Reply-To: <1244385036.3402.11.camel@myhost>

Commit-ID:  aeef50bc0483fa70ce0bddb686ec84a274b7f3d4
Gitweb:     http://git.kernel.org/tip/aeef50bc0483fa70ce0bddb686ec84a274b7f3d4
Author:     Figo.zhang <figo1802@gmail.com>
AuthorDate: Sun, 7 Jun 2009 22:30:36 +0800
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Sun, 7 Jun 2009 16:35:11 +0200

x86, microcode: Simplify vfree() use

vfree() does its own 'NULL' check, so no need for check before
calling it.

In v2, remove the stray newline.

[ Impact: cleanup ]

Signed-off-by: Figo.zhang <figo1802@gmail.com>
Cc: Dmitry Adamushko <dmitry.adamushko@gmail.com>
LKML-Reference: <1244385036.3402.11.camel@myhost>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 arch/x86/kernel/microcode_amd.c |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index c8be20f..366baa1 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -241,10 +241,8 @@ static int install_equiv_cpu_table(const u8 *buf)
 
 static void free_equiv_cpu_table(void)
 {
-	if (equiv_cpu_table) {
-		vfree(equiv_cpu_table);
-		equiv_cpu_table = NULL;
-	}
+	vfree(equiv_cpu_table);
+	equiv_cpu_table = NULL;
 }
 
 static enum ucode_state
@@ -279,8 +277,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)
 
 		mc_header = (struct microcode_header_amd *)mc;
 		if (get_matching_microcode(cpu, mc, new_rev)) {
-			if (new_mc)
-				vfree(new_mc);
+			vfree(new_mc);
 			new_rev = mc_header->patch_id;
 			new_mc  = mc;
 		} else
@@ -292,8 +289,7 @@ generic_load_microcode(int cpu, const u8 *data, size_t size)
 
 	if (new_mc) {
 		if (!leftover) {
-			if (uci->mc)
-				vfree(uci->mc);
+			vfree(uci->mc);
 			uci->mc = new_mc;
 			pr_debug("microcode: CPU%d found a matching microcode "
 				 "update with version 0x%x (current=0x%x)\n",

  reply	other threads:[~2009-06-07 14:43 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-07  5:18 [PATCH]X86:microcode: fix vfree() Figo.zhang
2009-06-07 14:01 ` Ingo Molnar
2009-06-07 14:18   ` [PATCH RESEND]X86:microcode: " Figo.zhang
2009-06-07 14:21     ` Ingo Molnar
2009-06-07 14:25       ` Figo.zhang
2009-06-07 14:28         ` Ingo Molnar
2009-06-07 14:30       ` [PATCH v2]X86:microcode: " Figo.zhang
2009-06-07 14:42         ` tip-bot for Figo.zhang [this message]
2009-06-10 14:23         ` Figo.zhang

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=tip-aeef50bc0483fa70ce0bddb686ec84a274b7f3d4@git.kernel.org \
    --to=figo1802@gmail.com \
    --cc=dmitry.adamushko@gmail.com \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=mingo@redhat.com \
    --cc=tglx@linutronix.de \
    /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