ACPI / PNP: remove Fujitsu device IDs from ACPI PNP ID list (49901414) · Commits · 戴 / test

Fujitsu backlight and hotkey devices have ACPI drivers. The PNP MODULE_DEVICE_TABLE in fujitsu-laptop driver is just used as an indicator for module autoloading, but this is wrong because what we need is ACPI module device table instead, because the driver is probing ACPI devices. Thus remove those IDs from ACPI PNP scan handler list as we don't have a PNP driver for them, and convert the fujitsu-laptop PNP MODULE_DEVICE_TABLE to ACPI MODULE_DEVICE_TABLE. Link: https://bugzilla.kernel.org/show_bug.cgi?id=81971 Signed-off-by:

Zhang Rui <rui.zhang@intel.com> Tested-by:

Dirk Griesbach <spamthis@freenet.de> Acked-by:

Darren Hart <dvhart@linux.intel.com> Signed-off-by:

Rafael J. Wysocki <rafael.j.wysocki@intel.com>

drivers/acpi/acpi_pnp.c

+0 −4

Original line number	Diff line number	Diff line
		@@ -132,10 +132,6 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
		{"PNP0401"}, /* ECP Printer Port */
		/* apple-gmux */
		{"APP000B"},
		/* fujitsu-laptop.c */
		{"FUJ02bf"},
		{"FUJ02B1"},
		{"FUJ02E3"},
		/* system */
		{"PNP0c02"}, /* General ID for reserving resources */
		{"PNP0c01"}, /* memory controller */

drivers/platform/x86/fujitsu-laptop.c

+7 −9

Original line number	Diff line number	Diff line
		@@ -1050,6 +1050,13 @@ static struct acpi_driver acpi_fujitsu_hotkey_driver = {
		},
		};

		static const struct acpi_device_id fujitsu_ids[] __used = {
		{ACPI_FUJITSU_HID, 0},
		{ACPI_FUJITSU_HOTKEY_HID, 0},
		{"", 0}
		};
		MODULE_DEVICE_TABLE(acpi, fujitsu_ids);

		static int __init fujitsu_init(void)
		{
		int ret, result, max_brightness;
		@@ -1208,12 +1215,3 @@ MODULE_LICENSE("GPL");
		MODULE_ALIAS("dmi::svnFUJITSUSIEMENS::pvr:rvnFUJITSU:rnFJNB1D3::cvrS6410:");
		MODULE_ALIAS("dmi::svnFUJITSUSIEMENS::pvr:rvnFUJITSU:rnFJNB1E6::cvrS6420:");
		MODULE_ALIAS("dmi::svnFUJITSU::pvr:rvnFUJITSU:rnFJNB19C::cvrS7020:");

		static struct pnp_device_id pnp_ids[] __used = {
		{.id = "FUJ02bf"},
		{.id = "FUJ02B1"},
		{.id = "FUJ02E3"},
		{.id = ""}
		};

		MODULE_DEVICE_TABLE(pnp, pnp_ids);

Admin message