lkml.org 
[lkml]   [2009]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/microcode] x86, microcode: Simplify vfree() use
    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",

    \
     
     \ /
      Last update: 2009-06-07 16:45    [W:0.023 / U:157.260 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site