@@ -206,75 +206,75 @@ static int __init dmi_matched(const struct dmi_system_id *dmi)
static const struct dmi_system_id alienware_quirks[] __initconst = {
{
.callback = dmi_matched,
- .ident = "Alienware X51 R3",
+ .ident = "Alienware ASM100",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R3"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "ASM100"),
},
- .driver_data = &quirk_x51_r3,
+ .driver_data = &quirk_asm100,
},
{
.callback = dmi_matched,
- .ident = "Alienware X51 R2",
+ .ident = "Alienware ASM200",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R2"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "ASM200"),
},
- .driver_data = &quirk_x51_r1_r2,
+ .driver_data = &quirk_asm200,
},
{
.callback = dmi_matched,
- .ident = "Alienware X51 R1",
+ .ident = "Alienware ASM201",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "ASM201"),
},
- .driver_data = &quirk_x51_r1_r2,
+ .driver_data = &quirk_asm201,
},
{
.callback = dmi_matched,
- .ident = "Alienware ASM100",
+ .ident = "Alienware x15 R1",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "ASM100"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Alienware x15 R1"),
},
- .driver_data = &quirk_asm100,
+ .driver_data = &quirk_x_series,
},
{
.callback = dmi_matched,
- .ident = "Alienware ASM200",
+ .ident = "Alienware X51 R1",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "ASM200"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51"),
},
- .driver_data = &quirk_asm200,
+ .driver_data = &quirk_x51_r1_r2,
},
{
.callback = dmi_matched,
- .ident = "Alienware ASM201",
+ .ident = "Alienware X51 R2",
.matches = {
DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "ASM201"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R2"),
},
- .driver_data = &quirk_asm201,
+ .driver_data = &quirk_x51_r1_r2,
},
{
.callback = dmi_matched,
- .ident = "Dell Inc. Inspiron 5675",
+ .ident = "Alienware X51 R3",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
- DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5675"),
+ DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Alienware X51 R3"),
},
- .driver_data = &quirk_inspiron5675,
+ .driver_data = &quirk_x51_r3,
},
{
.callback = dmi_matched,
- .ident = "Alienware x15 R1",
+ .ident = "Dell Inc. Inspiron 5675",
.matches = {
- DMI_MATCH(DMI_SYS_VENDOR, "Alienware"),
- DMI_MATCH(DMI_PRODUCT_NAME, "Alienware x15 R1"),
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 5675"),
},
- .driver_data = &quirk_x_series,
+ .driver_data = &quirk_inspiron5675,
},
{}
};
alienware_quirks[] entries are now ordered alphabetically Signed-off-by: Kurt Borja <kuurtb@gmail.com> --- drivers/platform/x86/dell/alienware-wmi.c | 52 +++++++++++------------ 1 file changed, 26 insertions(+), 26 deletions(-)