Skip to content

Commit 6718665

Browse files
committed
platform/x86: asus-nb-wmi: Drop duplicate DMI quirk structures
There is no need to repeat the same data structure for a quirk. Drop a duplicate and rename to be more generic. Signed-off-by: Andy Shevchenko <[email protected]>
1 parent 066d7f3 commit 6718665

File tree

1 file changed

+9
-14
lines changed

1 file changed

+9
-14
lines changed

drivers/platform/x86/asus-nb-wmi.c

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,7 @@ static struct quirk_entry quirk_asus_forceals = {
110110
.wmi_force_als_set = true,
111111
};
112112

113-
static struct quirk_entry quirk_asus_ga401i = {
114-
.wmi_backlight_power = true,
115-
.wmi_backlight_set_devstate = true,
116-
};
117-
118-
static struct quirk_entry quirk_asus_ga502i = {
113+
static struct quirk_entry quirk_asus_vendor_backlight = {
119114
.wmi_backlight_power = true,
120115
.wmi_backlight_set_devstate = true,
121116
};
@@ -428,7 +423,7 @@ static const struct dmi_system_id asus_quirks[] = {
428423
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
429424
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IH"),
430425
},
431-
.driver_data = &quirk_asus_ga401i,
426+
.driver_data = &quirk_asus_vendor_backlight,
432427
},
433428
{
434429
.callback = dmi_matched,
@@ -437,7 +432,7 @@ static const struct dmi_system_id asus_quirks[] = {
437432
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
438433
DMI_MATCH(DMI_PRODUCT_NAME, "GA401II"),
439434
},
440-
.driver_data = &quirk_asus_ga401i,
435+
.driver_data = &quirk_asus_vendor_backlight,
441436
},
442437
{
443438
.callback = dmi_matched,
@@ -446,7 +441,7 @@ static const struct dmi_system_id asus_quirks[] = {
446441
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
447442
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IU"),
448443
},
449-
.driver_data = &quirk_asus_ga401i,
444+
.driver_data = &quirk_asus_vendor_backlight,
450445
},
451446
{
452447
.callback = dmi_matched,
@@ -455,7 +450,7 @@ static const struct dmi_system_id asus_quirks[] = {
455450
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
456451
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IV"),
457452
},
458-
.driver_data = &quirk_asus_ga401i,
453+
.driver_data = &quirk_asus_vendor_backlight,
459454
},
460455
{
461456
.callback = dmi_matched,
@@ -464,7 +459,7 @@ static const struct dmi_system_id asus_quirks[] = {
464459
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
465460
DMI_MATCH(DMI_PRODUCT_NAME, "GA401IVC"),
466461
},
467-
.driver_data = &quirk_asus_ga401i,
462+
.driver_data = &quirk_asus_vendor_backlight,
468463
},
469464
{
470465
.callback = dmi_matched,
@@ -473,7 +468,7 @@ static const struct dmi_system_id asus_quirks[] = {
473468
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
474469
DMI_MATCH(DMI_PRODUCT_NAME, "GA502II"),
475470
},
476-
.driver_data = &quirk_asus_ga502i,
471+
.driver_data = &quirk_asus_vendor_backlight,
477472
},
478473
{
479474
.callback = dmi_matched,
@@ -482,7 +477,7 @@ static const struct dmi_system_id asus_quirks[] = {
482477
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
483478
DMI_MATCH(DMI_PRODUCT_NAME, "GA502IU"),
484479
},
485-
.driver_data = &quirk_asus_ga502i,
480+
.driver_data = &quirk_asus_vendor_backlight,
486481
},
487482
{
488483
.callback = dmi_matched,
@@ -491,7 +486,7 @@ static const struct dmi_system_id asus_quirks[] = {
491486
DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
492487
DMI_MATCH(DMI_PRODUCT_NAME, "GA502IV"),
493488
},
494-
.driver_data = &quirk_asus_ga502i,
489+
.driver_data = &quirk_asus_vendor_backlight,
495490
},
496491
{},
497492
};

0 commit comments

Comments
 (0)