diff mbox series

[tip:,x86/platform] x86/rtc: Simplify PNP ids check

Message ID 167300208315.4906.17267307487336474723.tip-bot2@tip-bot2
State New
Headers
Series [tip:,x86/platform] x86/rtc: Simplify PNP ids check |

Commit Message

tip-bot2 for Thomas Gleixner Jan. 6, 2023, 10:48 a.m. UTC 
  The following commit has been merged into the x86/platform branch of tip:

Commit-ID:     bd4edba2653aeef0119b7a945f07e58711343bf9
Gitweb:        https://git.kernel.org/tip/bd4edba2653aeef0119b7a945f07e58711343bf9
Author:        Hans de Goede <hdegoede@redhat.com>
AuthorDate:    Wed, 14 Dec 2022 22:24:47 +01:00
Committer:     Ingo Molnar <mingo@kernel.org>
CommitterDate: Fri, 06 Jan 2023 04:22:34 +01:00

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
---
 arch/x86/kernel/rtc.c |  9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/arch/x86/kernel/rtc.c b/arch/x86/kernel/rtc.c
index 3490464..1309b9b 100644
--- a/arch/x86/kernel/rtc.c
+++ b/arch/x86/kernel/rtc.c
@@ -138,15 +138,12 @@  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)
-					return 0;
-			}
+		for (i = 0; i < ARRAY_SIZE(ids); i++) {
+			if (compare_pnp_id(dev->id, ids[i]) != 0)
+				return 0;
 		}
 	}
 #endif