50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
|
|
index 45d9010aafcf..5ac17e360fa2 100644
|
|
--- a/drivers/platform/x86/wmi.c
|
|
+++ b/drivers/platform/x86/wmi.c
|
|
@@ -1102,28 +1102,6 @@ static void wmi_free_devices(struct acpi_device *device)
|
|
}
|
|
}
|
|
|
|
-static bool guid_already_parsed(struct acpi_device *device,
|
|
- const u8 *guid)
|
|
-{
|
|
- struct wmi_block *wblock;
|
|
-
|
|
- list_for_each_entry(wblock, &wmi_block_list, list) {
|
|
- if (memcmp(wblock->gblock.guid, guid, 16) == 0) {
|
|
- /*
|
|
- * Because we historically didn't track the relationship
|
|
- * between GUIDs and ACPI nodes, we don't know whether
|
|
- * we need to suppress GUIDs that are unique on a
|
|
- * given node but duplicated across nodes.
|
|
- */
|
|
- dev_warn(&device->dev, "duplicate WMI GUID %pUL (first instance was on %s)\n",
|
|
- guid, dev_name(&wblock->acpi_device->dev));
|
|
- return true;
|
|
- }
|
|
- }
|
|
-
|
|
- return false;
|
|
-}
|
|
-
|
|
/*
|
|
* Parse the _WDG method for the GUID data blocks
|
|
*/
|
|
@@ -1157,15 +1135,6 @@ static int parse_wdg(struct device *wmi_bus_dev, struct acpi_device *device)
|
|
if (debug_dump_wdg)
|
|
wmi_dump_wdg(&gblock[i]);
|
|
|
|
- /*
|
|
- * Some WMI devices, like those for nVidia hooks, have a
|
|
- * duplicate GUID. It's not clear what we should do in this
|
|
- * case yet, so for now, we'll just ignore the duplicate
|
|
- * for device creation.
|
|
- */
|
|
- if (guid_already_parsed(device, gblock[i].guid))
|
|
- continue;
|
|
-
|
|
wblock = kzalloc(sizeof(struct wmi_block), GFP_KERNEL);
|
|
if (!wblock) {
|
|
retval = -ENOMEM;
|