Commit 065f3e49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v4.11-2' of git://git.infradead.org/linux-platform-drivers-x86 

Pull x86 platform driver updates from Darren Hart:
 "Asus fixes for the airplane LED and a long awaited fujitsu cleanup.

  asus-wmi:
   - Remove quirk_no_rfkill
   - Detect quirk_no_rfkill from the DSDT

  fujitsu-laptop:
   - remove redundant MODULE_ALIAS entries
   - autodetect LCD interface on all models
   - simplify acpi_bus_register_driver() error handling
   - remove redundant forward declarations
   - replace numeric values with constants
   - rename FUNC_RFKILL to FUNC_FLAGS
   - make platform-related variables match naming convention
   - replace "hotkey" with "laptop" in symbol names
   - clearly denote backlight-related symbols"

* tag 'platform-drivers-x86-v4.11-2' of git://git.infradead.org/linux-platform-drivers-x86:
  platform/x86: asus-wmi: Remove quirk_no_rfkill
  platform/x86: asus-wmi: Detect quirk_no_rfkill from the DSDT
  platform/x86: fujitsu-laptop: remove redundant MODULE_ALIAS entries
  platform/x86: fujitsu-laptop: autodetect LCD interface on all models
  platform/x86: fujitsu-laptop: simplify acpi_bus_register_driver() error handling
  platform/x86: fujitsu-laptop: remove redundant forward declarations
  platform/x86: fujitsu-laptop: replace numeric values with constants
  platform/x86: fujitsu-laptop: rename FUNC_RFKILL to FUNC_FLAGS
  platform/x86: fujitsu-laptop: make platform-related variables match naming convention
  platform/x86: fujitsu-laptop: replace "hotkey" with "laptop" in symbol names
  platform/x86: fujitsu-laptop: clearly denote backlight-related symbols
parents ce70df08 d1c4e9bf

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

+17 −5
Original line number Diff line number Diff line
@@ -159,6 +159,8 @@ MODULE_LICENSE("GPL"); 
#define USB_INTEL_XUSB2PR		0xD0

#define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI	0x9c31



static const char * const ashs_ids[] = { "ATK4001", "ATK4002", NULL };



struct bios_args {

	u32 arg0;

	u32 arg1;
@@ -2051,6 +2053,16 @@ static int asus_wmi_fan_init(struct asus_wmi *asus) 
	return 0;

}



static bool ashs_present(void)

{

	int i = 0;

	while (ashs_ids[i]) {

		if (acpi_dev_found(ashs_ids[i++]))

			return true;

	}

	return false;

}



/*

 * WMI Driver

 */
@@ -2095,7 +2107,11 @@ static int asus_wmi_add(struct platform_device *pdev) 
	if (err)

		goto fail_leds;



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

	asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_WLAN, &result);

	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())) {

		err = asus_wmi_rfkill_init(asus);

		if (err)

			goto fail_rfkill;
@@ -2134,10 +2150,6 @@ static int asus_wmi_add(struct platform_device *pdev) 
	if (err)

		goto fail_debugfs;



	asus_wmi_get_devstate(asus, ASUS_WMI_DEVID_WLAN, &result);

	if (result & (ASUS_WMI_DSTS_PRESENCE_BIT | ASUS_WMI_DSTS_USER_BIT))

		asus->driver->wlan_ctrl_by_user = 1;



	return 0;



fail_debugfs:

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;

drivers/platform/x86/fujitsu-laptop.c

+222 −229

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE