[GIT PULL] x86/platform updates for v6.15

[GIT PULL] x86/platform updates for v6.15

[Ingo Molnar]

Linus,

Please pull the latest x86/platform Git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-2025-03-22

   # HEAD: ef69de53c46a4b526442f6bc5970fc14f7a0bb32 x86/platform/olpc: Remove unused variable 'len' in olpc_dt_compatible_match()

Two small cleanups in the x86 platform support code.

 Thanks,

	Ingo

------------------>
Wolfram Sang (1):
      x86/platform/olpc-xo1-sci: Don't include <linux/pm_wakeup.h> directly

Zeng Heng (1):
      x86/platform/olpc: Remove unused variable 'len' in olpc_dt_compatible_match()


 arch/x86/platform/olpc/olpc-xo1-sci.c | 1 -
 arch/x86/platform/olpc/olpc_dt.c      | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc/olpc-xo1-sci.c
index ccb23c73cbe8..63066e7c8517 100644
--- a/arch/x86/platform/olpc/olpc-xo1-sci.c
+++ b/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>
diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
index cf5dca2dbb91..e108ce7dad6a 100644
--- a/arch/x86/platform/olpc/olpc_dt.c
+++ b/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;

Re: [GIT PULL] x86/platform updates for v6.15

[pr-tracker-bot]

The pull request you sent on Sat, 22 Mar 2025 13:04:17 +0100:

> git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-2025-03-22

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/001a3a0c6a3fdde75548ed409915ebe1c80ac817

Thank you!

-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/prtracker.html