Merge tag 'x86-platform-2025-03-22' of git://git.kernel.org/pub/scm/l…

…inux/kernel/git/tip/tip

Pull x86 platform updates from Ingo Molnar:
 "Two small cleanups in the x86 platform support code"

* tag 'x86-platform-2025-03-22' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/olpc: Remove unused variable 'len' in olpc_dt_compatible_match()
  x86/platform/olpc-xo1-sci: Don't include <linux/pm_wakeup.h> directly

arch/x86/platform/olpc/olpc-xo1-sci.c

@@ -14,7 +14,6 @@
 #include <linux/interrupt.h>
 #include <linux/platform_device.h>
 #include <linux/pm.h>
-#include <linux/pm_wakeup.h>
 #include <linux/power_supply.h>
 #include <linux/suspend.h>
 #include <linux/workqueue.h>

arch/x86/platform/olpc/olpc_dt.c

@@ -215,13 +215,12 @@ static u32 __init olpc_dt_get_board_revision(void)
 static int __init olpc_dt_compatible_match(phandle node, const char *compat)
 {
 	char buf[64], *p;
-	int plen, len;
+	int plen;
 
 	plen = olpc_dt_getproperty(node, "compatible", buf, sizeof(buf));
 	if (plen <= 0)
 		return 0;
 
-	len = strlen(compat);
 	for (p = buf; p < buf + plen; p += strlen(p) + 1) {
 		if (strcmp(p, compat) == 0)
 			return 1;