Commit bd4edba2 authored Dec 14, 2022 by Hans de Goede Committed by Ingo Molnar Jan 06, 2023

x86/rtc: Simplify PNP ids check



compare_pnp_id() already iterates over the single linked pnp_ids list
starting with the id past to it.

So there is no need for add_rtc_cmos() to call compare_pnp_id()
for each id on the list.

No change in functionality intended.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Cc: linux-kernel@vger.kernel.org

parent 41c03ba9

arch/x86/kernel/rtc.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -138,17 +138,14 @@ static __init int add_rtc_cmos(void)
		static const char * const ids[] __initconst =
		{ "PNP0b00", "PNP0b01", "PNP0b02", };
		struct pnp_dev *dev;
		struct pnp_id *id;
		int i;

		pnp_for_each_dev(dev) {
		for (id = dev->id; id; id = id->next) {
		for (i = 0; i < ARRAY_SIZE(ids); i++) {
		if (compare_pnp_id(id, ids[i]) != 0)
		if (compare_pnp_id(dev->id, ids[i]) != 0)
		return 0;
		}
		}
		}
		#endif
		if (!x86_platform.legacy.rtc)
		return -ENODEV;