ACPI: PNP: Drop CMOS RTC PNP device support

A previous change updated is_cmos_rtc_device() to effectively never
allow PNP devices to be created for the CMOS RTC on x86 with ACPI
and the PNP bus type is only used on x86, so the CMOS RTC device IDs
can be dropped from acpi_pnp_device_ids[] and is_cmos_rtc_device() can
go away completely.

Update the code accordingly.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/3411834.aeNJFYEL58@rafael.j.wysocki

diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c
index 4ad8f56d1a5d060646fdd20a0c8d9109fa2bbf75..da886923b0082d3d1bc92904e16ee32781326bf6 100644 (file)
--- a/drivers/acpi/acpi_pnp.c
+++ b/drivers/acpi/acpi_pnp.c
@@ -125,10 +125,6 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
        {"PNP0401"},            /* ECP Printer Port */
        /* apple-gmux */
        {"APP000B"},
-       /* rtc_cmos */
-       {"PNP0b00"},
-       {"PNP0b01"},
-       {"PNP0b02"},
        /* c6xdigio */
        {"PNP0400"},            /* Standard LPT Printer Port */
        {"PNP0401"},            /* ECP Printer Port */
@@ -355,25 +351,9 @@ static struct acpi_scan_handler acpi_pnp_handler = {
        .attach = acpi_pnp_attach,
 };
 
-/*
- * For CMOS RTC devices, the PNP ACPI scan handler does not work, because
- * there is a CMOS RTC ACPI scan handler installed already, so we need to
- * check those devices and enumerate them to the PNP bus directly.
- */
-static int is_cmos_rtc_device(struct acpi_device *adev)
-{
-       static const struct acpi_device_id ids[] = {
-               { "PNP0B00" },
-               { "PNP0B01" },
-               { "PNP0B02" },
-               {""},
-       };
-       return !cmos_rtc_platform_device_present && !acpi_match_device_ids(adev, ids);
-}
-
 bool acpi_is_pnp_device(struct acpi_device *adev)
 {
-       return adev->handler == &acpi_pnp_handler || is_cmos_rtc_device(adev);
+       return adev->handler == &acpi_pnp_handler;
 }
 EXPORT_SYMBOL_GPL(acpi_is_pnp_device);