tmakin/ack-tegra
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds committed 2025-03-24 23:03:33 -07:00
2 parents 8ac6067bd8 ef69de53c4
commit 001a3a0c6a
2 files changed
+1 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

arch/x86/platform/olpc/olpc-xo1-sci.c
-1
View File
@@ -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
+1 -2
View File
@@ -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;