diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2014-05-30 04:24:04 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-30 16:04:36 +0200 |
| commit | e1d2c4cf0bfa6a9b484ebcb2ce99c5f38d05c680 (patch) | |
| tree | b5a355154b37693fa3cc033c29a229cb76c624a3 /drivers/acpi/acpi_pnp.c | |
| parent | eec15edbb0e14485998635ea7c62e30911b465f0 (diff) | |
| download | linux-stable-e1d2c4cf0bfa6a9b484ebcb2ce99c5f38d05c680.tar.gz linux-stable-e1d2c4cf0bfa6a9b484ebcb2ce99c5f38d05c680.tar.bz2 linux-stable-e1d2c4cf0bfa6a9b484ebcb2ce99c5f38d05c680.zip | |
ACPI / scan: drop IDs that do not comply with the ACPI PNP ID rule
The PNP ACPI scan handler device ID list includes all the IDs from
all of the struct pnp_device_id instances in the tree, but some of
them do not follow the ACPI PNP ID rule (3 letters + 4 hex digits).
For those IDs, the coressponding devices will never be enumerated
via ACPI, so it is safe to remove them from the PNP ACPI ID list.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
[rjw: Subject and changelog]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Diffstat (limited to 'drivers/acpi/acpi_pnp.c')
| -rw-r--r-- | drivers/acpi/acpi_pnp.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c index 567e7fc6330c..895c45d8d25a 100644 --- a/drivers/acpi/acpi_pnp.c +++ b/drivers/acpi/acpi_pnp.c @@ -34,10 +34,6 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = { /* ide */ {"PNP0600"}, /* Generic ESDI/IDE/ATA compatible hard disk controller */ /* ns558 */ - {"@P@0001"}, /* ALS 100 */ - {"@P@0020"}, /* ALS 200 */ - {"@P@1001"}, /* ALS 100+ */ - {"@P@2001"}, /* ALS 120 */ {"ASB16fd"}, /* AdLib NSC16 */ {"AZT3001"}, /* AZT1008 */ {"CDC0001"}, /* Opl3-SAx */ |