linux-kernel - [tip:x86/platform] x86/platform/olpc: Do not call of_platform_bus

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Sat, 17 Nov 2018 10:42:55 -0800
From:   tip-bot for Rob Herring <tipbot@...or.com>
To:     linux-tip-commits@...r.kernel.org
Cc:     x86@...nel.org, lkundrak@...sk, robh@...nel.org, mingo@...hat.com,
        mingo@...nel.org, bp@...e.de, tglx@...utronix.de, hpa@...or.com,
        linux-kernel@...r.kernel.org
Subject: [tip:x86/platform] x86/platform/olpc: Do not call
 of_platform_bus_probe()

Commit-ID:  c04e55388a4f2184e37827a1d2e733cded52d653
Gitweb:     https://git.kernel.org/tip/c04e55388a4f2184e37827a1d2e733cded52d653
Author:     Rob Herring <robh@...nel.org>
AuthorDate: Fri, 16 Nov 2018 14:18:20 -0600
Committer:  Borislav Petkov <bp@...e.de>
CommitDate: Sat, 17 Nov 2018 19:29:55 +0100

x86/platform/olpc: Do not call of_platform_bus_probe()

The DT core will probe the DT by default now, so the OLPC platform code
calling of_platform_bus_probe() is not necessary. The algorithm for what
nodes are probed is a little different in how compatible is handled, but
since OLPC uses compatible strings for matching it is not affected by
this difference.

Also, only the battery node located at the root level gets a device
created as the dcon is a PCI device and the RTC device is created in
olpc-xo1-rtc.c.

Signed-off-by: Rob Herring <robh@...nel.org>
Signed-off-by: Borislav Petkov <bp@...e.de>
CC: "H. Peter Anvin" <hpa@...or.com>
CC: Ingo Molnar <mingo@...hat.com>
CC: Lubomir Rintel <lkundrak@...sk>
Cc: Thomas Gleixner <tglx@...utronix.de>
CC: devicetree@...r.kernel.org
CC: x86-ml <x86@...nel.org>
Link: http://lkml.kernel.org/r/20181116201820.10065-1-robh@kernel.org
---
 arch/x86/platform/olpc/olpc_dt.c | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/arch/x86/platform/olpc/olpc_dt.c b/arch/x86/platform/olpc/olpc_dt.c
index 24d2175a9480..b4ab779f1d47 100644
--- a/arch/x86/platform/olpc/olpc_dt.c
+++ b/arch/x86/platform/olpc/olpc_dt.c
@@ -19,7 +19,6 @@
 #include <linux/kernel.h>
 #include <linux/memblock.h>
 #include <linux/of.h>
-#include <linux/of_platform.h>
 #include <linux/of_pdt.h>
 #include <asm/olpc.h>
 #include <asm/olpc_ofw.h>
@@ -285,20 +284,3 @@ void __init olpc_dt_build_devicetree(void)
 	pr_info("PROM DT: Built device tree with %u bytes of memory.\n",
 			prom_early_allocated);
 }
-
-/* A list of DT node/bus matches that we want to expose as platform devices */
-static struct of_device_id __initdata of_ids[] = {
-	{ .compatible = "olpc,xo1-battery" },
-	{ .compatible = "olpc,xo1-dcon" },
-	{ .compatible = "olpc,xo1-rtc" },
-	{},
-};
-
-static int __init olpc_create_platform_devices(void)
-{
-	if (machine_is_olpc())
-		return of_platform_bus_probe(NULL, of_ids, NULL);
-	else
-		return 0;
-}
-device_initcall(olpc_create_platform_devices);