Skip to content

Commit dd2fc7b

Browse files
committed
ACPI: PNP: Drop acpi_nonpnp_device_ids[]
Now that "system" devices are represented as platform devices, they are not claimed by the PNP ACPI scan handler any more and platform devices can be created for ACPI device objects listing "system" device IDs as their compatible device IDs. Accordingly, it should not be necessary any more to add device IDs to acpi_nonpnp_device_ids[], so drop it. No intentional functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org> Link: https://patch.msgid.link/3587570.QJadu78ljV@rafael.j.wysocki
1 parent 686e905 commit dd2fc7b

1 file changed

Lines changed: 1 addition & 15 deletions

File tree

drivers/acpi/acpi_pnp.c

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -343,24 +343,10 @@ static bool acpi_pnp_match(const char *idstr, const struct acpi_device_id **matc
343343
return false;
344344
}
345345

346-
/*
347-
* If one of the device IDs below is present in the list of device IDs of a
348-
* given ACPI device object, the PNP scan handler will not attach to that
349-
* object, because there is a proper non-PNP driver in the kernel for the
350-
* device represented by it.
351-
*/
352-
static const struct acpi_device_id acpi_nonpnp_device_ids[] = {
353-
{"INT3F0D"},
354-
{"INTC1080"},
355-
{"INTC1081"},
356-
{"INTC1099"},
357-
{""},
358-
};
359-
360346
static int acpi_pnp_attach(struct acpi_device *adev,
361347
const struct acpi_device_id *id)
362348
{
363-
return !!acpi_match_device_ids(adev, acpi_nonpnp_device_ids);
349+
return true;
364350
}
365351

366352
static struct acpi_scan_handler acpi_pnp_handler = {

0 commit comments

Comments
 (0)