Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1c4e9bf authored by João Paulo Rechi Vita's avatar João Paulo Rechi Vita Committed by Darren Hart
Browse files

platform/x86: asus-wmi: Remove quirk_no_rfkill 



With the detection introduced in the previous patches, we don't need
these static DMI-based quirks anymore.

This reverts the following commits:
56a37a72 "asus-wmi: Add quirk_no_rfkill_wapf4 for the Asus X456UA"
a961a285 "asus-wmi: Add quirk_no_rfkill_wapf4 for the Asus X456UF"
6b7ff2af "asus-wmi: Add quirk_no_rfkill for the Asus Z550MA"
02db9ff7 "asus-wmi: Add quirk_no_rfkill for the Asus U303LB"
2d735244 "asus-wmi: Add quirk_no_rfkill for the Asus N552VW"
a977e59c "asus-wmi: Create quirk for airplane_mode LED"

Signed-off-by: default avatarJoão Paulo Rechi Vita <jprvita@endlessm.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
[dvhart: minor commit message corrections]
Signed-off-by: default avatarDarren Hart (VMware) <dvhart@infradead.org>
parent 71050ae7

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

+2 −47
Original line number Diff line number Diff line
@@ -103,15 +103,6 @@ static struct quirk_entry quirk_asus_x200ca = { 
	.wapf = 2,

};



static struct quirk_entry quirk_no_rfkill = {

	.no_rfkill = true,

};



static struct quirk_entry quirk_no_rfkill_wapf4 = {

	.wapf = 4,

	.no_rfkill = true,

};



static struct quirk_entry quirk_asus_ux303ub = {

	.wmi_backlight_native = true,

};
@@ -194,7 +185,7 @@ static const struct dmi_system_id asus_quirks[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X456UA"),

		},

		.driver_data = &quirk_no_rfkill_wapf4,

		.driver_data = &quirk_asus_wapf4,

	},

	{

		.callback = dmi_matched,
@@ -203,7 +194,7 @@ static const struct dmi_system_id asus_quirks[] = { 
			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X456UF"),

		},

		.driver_data = &quirk_no_rfkill_wapf4,

		.driver_data = &quirk_asus_wapf4,

	},

	{

		.callback = dmi_matched,
@@ -367,42 +358,6 @@ static const struct dmi_system_id asus_quirks[] = { 
		},

		.driver_data = &quirk_asus_x200ca,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. X555UB",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "X555UB"),

		},

		.driver_data = &quirk_no_rfkill,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. N552VW",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "N552VW"),

		},

		.driver_data = &quirk_no_rfkill,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. U303LB",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "U303LB"),

		},

		.driver_data = &quirk_no_rfkill,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. Z550MA",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_PRODUCT_NAME, "Z550MA"),

		},

		.driver_data = &quirk_no_rfkill,

	},

	{

		.callback = dmi_matched,

		.ident = "ASUSTeK COMPUTER INC. UX303UB",

drivers/platform/x86/asus-wmi.c

+1 −4
Original line number Diff line number Diff line
@@ -2111,10 +2111,7 @@ static int asus_wmi_add(struct platform_device *pdev) 
	if (result & (ASUS_WMI_DSTS_PRESENCE_BIT | ASUS_WMI_DSTS_USER_BIT))

		asus->driver->wlan_ctrl_by_user = 1;



	if (asus->driver->wlan_ctrl_by_user && ashs_present())

		asus->driver->quirks->no_rfkill = 1;



	if (!asus->driver->quirks->no_rfkill) {

	if (!(asus->driver->wlan_ctrl_by_user && ashs_present())) {

		err = asus_wmi_rfkill_init(asus);

		if (err)

			goto fail_rfkill;

drivers/platform/x86/asus-wmi.h

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ struct key_entry; 
struct asus_wmi;



struct quirk_entry {

	bool no_rfkill;

	bool hotplug_wireless;

	bool scalar_panel_brightness;

	bool store_backlight_power;