From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8996A2EAB72; Mon, 23 Feb 2026 15:33:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771860837; cv=none; b=CWmYkUSDI2a4ipTtxCBmtsDewSUb3Yxf3JxseR7Yj6UTaeFpVad5gpd2yc5SpU6YU+5XzYMDDLZCF3/Rs79qJ/Rms/KlJQA1X9C1r11+l8IH7tTc3btI9mGinnPkFyGOkvatMc7TNFvbIx+RmYIIyXFJyCJCRPWXuLtm0llGJhg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771860837; c=relaxed/simple; bh=BsaiQBR7+aghcgAvorr6U09qtFoCVRXsyoXDRtpWr5Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UzceLueMpj3pNZ6muqP5vPplgPYvxOwP8X4D7kXjz23wSAyoEDRrdct7l7j/KU/BGA9K2lPYjD9oxI1AxIHsuX5BnDjkZv+Kla5Eex5CI45y0LSsh05KnEBJ/ggo4BPHDoOCuw+w8DVwFg11+N87i4TvGJw8fubmF4fSs+zXGk0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Of/uO+lt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Of/uO+lt" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0ADC8C19423; Mon, 23 Feb 2026 15:33:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771860837; bh=BsaiQBR7+aghcgAvorr6U09qtFoCVRXsyoXDRtpWr5Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Of/uO+lt0CIRM8l33hHHhw03sq47brsVrI0GJ518a5Ep71eg6lecnNG8PZanb9Vlt RBfIgvrNQQrsXJi7dkw5WgDWcX6A3/Cq0vDcxmAgEhVBgWwDgZ+8zHrTCtsS6czA5u 73ipF8fb1IFo3B6Uj60ogkn2vt7LDPkbYi6XvVWPH9WnuOziwhbg3AYf8OIOfIhcdk 9rxd9tqzTDwEgL/rqNw9FWsFAZMz7LJp0lQVZcZSORhbKksVbce77sBTLwV6VLEUXf 1cCOnALu/zb6iqO+UVqtOC4GRZpaYnsUjocoHVQiwMBxtHvTX38vfQx5tEnveu0GLA bdZNQqmq+mdGA== From: "Rafael J. Wysocki" To: Linux ACPI Cc: LKML , x86 Maintainers , linux-rtc@vger.kernel.org, Alexandre Belloni Subject: [PATCH v1 5/8] ACPI: PNP: Drop CMOS RTC PNP device support Date: Mon, 23 Feb 2026 16:31:03 +0100 Message-ID: <3411834.aeNJFYEL58@rafael.j.wysocki> Organization: Linux Kernel Development In-Reply-To: <5983325.DvuYhMxLoT@rafael.j.wysocki> References: <5983325.DvuYhMxLoT@rafael.j.wysocki> Precedence: bulk X-Mailing-List: linux-rtc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="UTF-8" From: "Rafael J. Wysocki" 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 --- drivers/acpi/acpi_pnp.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/drivers/acpi/acpi_pnp.c b/drivers/acpi/acpi_pnp.c index 4ad8f56d1a5d..da886923b008 100644 --- 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); -- 2.51.0