lkml.org 
[lkml]   [2010]   [Jul]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] compal-laptop/fujitsu-laptop/msi-laptop: make dmi_check_cb to return 1 instead of 0
    From
    Date
    dmi_check_system() walks the table running matching functions until someone
    returns non zero or we hit the end.

    This patch makes dmi_check_cb to return 1 so dmi_check_system() return
    immediately when a match is found.

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/platform/x86/compal-laptop.c | 2 +-
    drivers/platform/x86/fujitsu-laptop.c | 6 +++---
    drivers/platform/x86/msi-laptop.c | 2 +-
    3 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/drivers/platform/x86/compal-laptop.c b/drivers/platform/x86/compal-laptop.c
    index 71ff154..dc31a08 100644
    --- a/drivers/platform/x86/compal-laptop.c
    +++ b/drivers/platform/x86/compal-laptop.c
    @@ -190,7 +190,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
    printk(KERN_INFO "compal-laptop: Identified laptop model '%s'.\n",
    id->ident);

    - return 0;
    + return 1;
    }

    static struct dmi_system_id __initdata compal_dmi_table[] = {
    diff --git a/drivers/platform/x86/fujitsu-laptop.c b/drivers/platform/x86/fujitsu-laptop.c
    index dab1a0e..1859d7f 100644
    --- a/drivers/platform/x86/fujitsu-laptop.c
    +++ b/drivers/platform/x86/fujitsu-laptop.c
    @@ -603,7 +603,7 @@ static int dmi_check_cb_s6410(const struct dmi_system_id *id)
    dmi_check_cb_common(id);
    fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
    fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
    - return 0;
    + return 1;
    }

    static int dmi_check_cb_s6420(const struct dmi_system_id *id)
    @@ -611,7 +611,7 @@ static int dmi_check_cb_s6420(const struct dmi_system_id *id)
    dmi_check_cb_common(id);
    fujitsu->keycode1 = KEY_SCREENLOCK; /* "Lock" */
    fujitsu->keycode2 = KEY_HELP; /* "Mobility Center" */
    - return 0;
    + return 1;
    }

    static int dmi_check_cb_p8010(const struct dmi_system_id *id)
    @@ -620,7 +620,7 @@ static int dmi_check_cb_p8010(const struct dmi_system_id *id)
    fujitsu->keycode1 = KEY_HELP; /* "Support" */
    fujitsu->keycode3 = KEY_SWITCHVIDEOMODE; /* "Presentation" */
    fujitsu->keycode4 = KEY_WWW; /* "Internet" */
    - return 0;
    + return 1;
    }

    static struct dmi_system_id fujitsu_dmi_table[] = {
    diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c
    index afd762b..c67a74c 100644
    --- a/drivers/platform/x86/msi-laptop.c
    +++ b/drivers/platform/x86/msi-laptop.c
    @@ -434,7 +434,7 @@ static int dmi_check_cb(const struct dmi_system_id *id)
    {
    printk(KERN_INFO "msi-laptop: Identified laptop model '%s'.\n",
    id->ident);
    - return 0;
    + return 1;
    }

    static struct dmi_system_id __initdata msi_dmi_table[] = {
    --
    1.5.4.3




    \
     
     \ /
      Last update: 2010-07-02 11:07    [W:0.023 / U:61.020 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site