Skip to content

Commit 001a3a0

Browse files
committed
Merge tag 'x86-platform-2025-03-22' of git://git.kernel.org/pub/scm/linux/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
2 parents 8ac6067 + ef69de5 commit 001a3a0

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include <linux/interrupt.h>
1515
#include <linux/platform_device.h>
1616
#include <linux/pm.h>
17-
#include <linux/pm_wakeup.h>
1817
#include <linux/power_supply.h>
1918
#include <linux/suspend.h>
2019
#include <linux/workqueue.h>

arch/x86/platform/olpc/olpc_dt.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -215,13 +215,12 @@ static u32 __init olpc_dt_get_board_revision(void)
215215
static int __init olpc_dt_compatible_match(phandle node, const char *compat)
216216
{
217217
char buf[64], *p;
218-
int plen, len;
218+
int plen;
219219

220220
plen = olpc_dt_getproperty(node, "compatible", buf, sizeof(buf));
221221
if (plen <= 0)
222222
return 0;
223223

224-
len = strlen(compat);
225224
for (p = buf; p < buf + plen; p += strlen(p) + 1) {
226225
if (strcmp(p, compat) == 0)
227226
return 1;

0 commit comments

Comments
 (0)