2009-06-07 05:19:33

by Figo.zhang

Subject: [PATCH]X86:microcode: fix vfree()

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

Signed-off-by: Figo.zhang <[email protected]>
---
arch/x86/kernel/microcode_amd.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 453b579..fe577fd 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -257,10 +257,9 @@ 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 int generic_load_microcode(int cpu, const u8 *data, size_t size)
@@ -293,8 +292,7 @@ static int 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
@@ -306,8 +304,7 @@ static int 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",

2009-06-07 14:01:33

by Ingo Molnar

Subject: Re: [PATCH]X86:microcode: fix vfree()

* Figo.zhang <[email protected]> wrote:

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

looks good, but:

s/it's/its/
s/check,so/check, so/

and:

> 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;
> +
> }

stray newline and tab.

Ingo

2009-06-07 14:18:53

by Figo.zhang

Subject: [PATCH RESEND]X86:microcode: fix vfree()

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

Signed-off-by: Figo.zhang <[email protected]>
---
arch/x86/kernel/microcode_amd.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
index 453b579..8f52cf4 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -257,10 +257,9 @@ 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 int generic_load_microcode(int cpu, const u8 *data, size_t size)
@@ -293,8 +292,7 @@ static int 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
@@ -306,8 +304,7 @@ static int 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",

2009-06-07 14:21:29

by Ingo Molnar

Subject: Re: [PATCH RESEND]X86:microcode: fix vfree()

(Note: it's not a 'resend', it's v2 of the patch)

* Figo.zhang <[email protected]> wrote:

> vfree() does its own 'NULL' check, so no need for check before
> calling it.
>
> Signed-off-by: Figo.zhang <[email protected]>
> ---
> arch/x86/kernel/microcode_amd.c | 13 +++++--------
> 1 files changed, 5 insertions(+), 8 deletions(-)
>
> diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
> index 453b579..8f52cf4 100644
> --- a/arch/x86/kernel/microcode_amd.c
> +++ b/arch/x86/kernel/microcode_amd.c
> @@ -257,10 +257,9 @@ 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;
> +

you fixed the tab but you didnt remove the stray newline :)

Ingo

2009-06-07 14:25:50

by Figo.zhang

Subject: Re: [PATCH RESEND]X86:microcode: fix vfree()

On Sun, 2009-06-07 at 16:21 +0200, Ingo Molnar wrote:
> (Note: it's not a 'resend', it's v2 of the patch)
>
> * Figo.zhang <[email protected]> wrote:
>
> > vfree() does its own 'NULL' check, so no need for check before
> > calling it.
> >
> > Signed-off-by: Figo.zhang <[email protected]>
> > ---
> > arch/x86/kernel/microcode_amd.c | 13 +++++--------
> > 1 files changed, 5 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
> > index 453b579..8f52cf4 100644
> > --- a/arch/x86/kernel/microcode_amd.c
> > +++ b/arch/x86/kernel/microcode_amd.c
> > @@ -257,10 +257,9 @@ 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;
> > +

i motify by vim, you said this line?

Best Regards,

Figo.zhang

>
> you fixed the tab but you didnt remove the stray newline :)
>
> Ingo

2009-06-07 14:28:28

by Ingo Molnar

Subject: Re: [PATCH RESEND]X86:microcode: fix vfree()

* Figo.zhang <[email protected]> wrote:

> On Sun, 2009-06-07 at 16:21 +0200, Ingo Molnar wrote:
> > (Note: it's not a 'resend', it's v2 of the patch)
> >
> > * Figo.zhang <[email protected]> wrote:
> >
> > > vfree() does its own 'NULL' check, so no need for check before
> > > calling it.
> > >
> > > Signed-off-by: Figo.zhang <[email protected]>
> > > ---
> > > arch/x86/kernel/microcode_amd.c | 13 +++++--------
> > > 1 files changed, 5 insertions(+), 8 deletions(-)
> > >
> > > diff --git a/arch/x86/kernel/microcode_amd.c b/arch/x86/kernel/microcode_amd.c
> > > index 453b579..8f52cf4 100644
> > > --- a/arch/x86/kernel/microcode_amd.c
> > > +++ b/arch/x86/kernel/microcode_amd.c
> > > @@ -257,10 +257,9 @@ 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;
> > > +
>
> i motify by vim, you said this line?

yes, that extra empty newline should not be there. (i.e. the line
should be removed)

Ingo

2009-06-07 14:30:48

by Figo.zhang

Subject: [PATCH v2]X86:microcode: fix vfree()

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

In v2, remove the stray newline.

Signed-off-by: Figo.zhang <[email protected]>
---
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 453b579..06fce9d 100644
--- a/arch/x86/kernel/microcode_amd.c
+++ b/arch/x86/kernel/microcode_amd.c
@@ -257,10 +257,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 int generic_load_microcode(int cpu, const u8 *data, size_t size)
@@ -293,8 +291,7 @@ static int 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
@@ -306,8 +303,7 @@ static int 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",

2009-06-07 14:43:20

by Figo.zhang

Subject: [tip:x86/microcode] x86, microcode: Simplify vfree() use

Commit-ID: aeef50bc0483fa70ce0bddb686ec84a274b7f3d4
Gitweb: http://git.kernel.org/tip/aeef50bc0483fa70ce0bddb686ec84a274b7f3d4
Author: Figo.zhang <[email protected]>
AuthorDate: Sun, 7 Jun 2009 22:30:36 +0800
Committer: Ingo Molnar <[email protected]>
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 <[email protected]>
Cc: Dmitry Adamushko <[email protected]>
LKML-Reference: <1244385036.3402.11.camel@myhost>
Signed-off-by: Ingo Molnar <[email protected]>


---
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",

2009-06-10 14:23:19

by Figo.zhang

Subject: Re: [PATCH v2]X86:microcode: fix vfree()

On Sun, 2009-06-07 at 22:30 +0800, Figo.zhang wrote:
> Ingo

hi, Ingo,
is it ok for v2?

Best Regards,

Figo.zhang