lkml.org 
[lkml]   [2021]   [Jul]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.12 222/700] platform/x86: asus-nb-wmi: Revert "Drop duplicate DMI quirk structures"
    Date
    From: Luke D. Jones <luke@ljones.dev>

    [ Upstream commit 98c0c85b1040db24f0d04d3e1d315c6c7b05cc07 ]

    This is a preparation revert for reverting the "add support for ASUS ROG
    Zephyrus G14 and G15" change. This reverts
    commit 67186653c903 ("platform/x86: asus-nb-wmi: Drop duplicate DMI quirk
    structures")

    Signed-off-by: Luke D. Jones <luke@ljones.dev>
    Link: https://lore.kernel.org/r/20210419074915.393433-2-luke@ljones.dev
    Signed-off-by: Hans de Goede <hdegoede@redhat.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/platform/x86/asus-nb-wmi.c | 23 ++++++++++++++---------
    1 file changed, 14 insertions(+), 9 deletions(-)

    diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c
    index d41d7ad14be0..b07b1288346e 100644
    --- a/drivers/platform/x86/asus-nb-wmi.c
    +++ b/drivers/platform/x86/asus-nb-wmi.c
    @@ -110,7 +110,12 @@ static struct quirk_entry quirk_asus_forceals = {
    .wmi_force_als_set = true,
    };

    -static struct quirk_entry quirk_asus_vendor_backlight = {
    +static struct quirk_entry quirk_asus_ga401i = {
    + .wmi_backlight_power = true,
    + .wmi_backlight_set_devstate = true,
    +};
    +
    +static struct quirk_entry quirk_asus_ga502i = {
    .wmi_backlight_power = true,
    .wmi_backlight_set_devstate = true,
    };
    @@ -432,7 +437,7 @@ static const struct dmi_system_id asus_quirks[] = {
    DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
    DMI_MATCH(DMI_PRODUCT_NAME, "GA401IH"),
    },
    - .driver_data = &quirk_asus_vendor_backlight,
    + .driver_data = &quirk_asus_ga401i,
    },
    {
    .callback = dmi_matched,
    @@ -441,7 +446,7 @@ static const struct dmi_system_id asus_quirks[] = {
    DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
    DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"),
    },
    - .driver_data = &quirk_asus_vendor_backlight,
    + .driver_data = &quirk_asus_ga401i,
    },
    {
    .callback = dmi_matched,
    @@ -450,7 +455,7 @@ static const struct dmi_system_id asus_quirks[] = {
    DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
    DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"),
    },
    - .driver_data = &quirk_asus_vendor_backlight,
    + .driver_data = &quirk_asus_ga401i,
    },
    {
    .callback = dmi_matched,
    @@ -459,7 +464,7 @@ static const struct dmi_system_id asus_quirks[] = {
    DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
    DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"),
    },
    - .driver_data = &quirk_asus_vendor_backlight,
    + .driver_data = &quirk_asus_ga401i,
    },
    {
    .callback = dmi_matched,
    @@ -468,7 +473,7 @@ static const struct dmi_system_id asus_quirks[] = {
    DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
    DMI_MATCH(DMI_PRODUCT_NAME, "GA401IVC"),
    },
    - .driver_data = &quirk_asus_vendor_backlight,
    + .driver_data = &quirk_asus_ga401i,
    },
    {
    .callback = dmi_matched,
    @@ -477,7 +482,7 @@ static const struct dmi_system_id asus_quirks[] = {
    DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
    DMI_MATCH(DMI_PRODUCT_NAME, "GA502II"),
    },
    - .driver_data = &quirk_asus_vendor_backlight,
    + .driver_data = &quirk_asus_ga502i,
    },
    {
    .callback = dmi_matched,
    @@ -486,7 +491,7 @@ static const struct dmi_system_id asus_quirks[] = {
    DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
    DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"),
    },
    - .driver_data = &quirk_asus_vendor_backlight,
    + .driver_data = &quirk_asus_ga502i,
    },
    {
    .callback = dmi_matched,
    @@ -495,7 +500,7 @@ static const struct dmi_system_id asus_quirks[] = {
    DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
    DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"),
    },
    - .driver_data = &quirk_asus_vendor_backlight,
    + .driver_data = &quirk_asus_ga502i,
    },
    {
    .callback = dmi_matched,
    --
    2.30.2


    \
     
     \ /
      Last update: 2021-07-12 09:35    [W:6.038 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site