hwprobe: convert PHB, NPU, PAU subsystems to hwprobe

Reviewed-by: Dan Horák <dan@danny.cz>
[npiggin: split out from initial hwprobe pach]
Signed-off-by: Stewart Smith <stewart@flamingspork.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>

5 files changed, 13 insertions, 6 deletions

diff --git a/hw/npu.c b/hw/npu.c
index dba7ee5..35e6372 100644
--- a/hw/npu.c
+++ b/hw/npu.c
@@ -1679,7 +1679,7 @@ static void npu_create_phb(struct dt_node *dn)
 	npu_hw_init(p);
 }
 
-void probe_npu(void)
+static void probe_npu(void)
 {
 	struct dt_node *np;
 
@@ -1691,3 +1691,5 @@ void probe_npu(void)
 	dt_for_each_compatible(dt_root, np, "ibm,power8-npu-pciex")
 		npu_create_phb(np);
 }
+
+DEFINE_HWPROBE_DEPS(npu, probe_npu, "phb3");
diff --git a/hw/npu2-common.c b/hw/npu2-common.c
index b3f500f..02f102f 100644
--- a/hw/npu2-common.c
+++ b/hw/npu2-common.c
@@ -619,7 +619,7 @@ static void setup_devices(struct npu2 *npu)
 		npu2_opencapi_init_npu(npu);
 }
 
-void probe_npu2(void)
+static void probe_npu2(void)
 {
 	struct proc_chip *chip = next_chip(NULL);
 	struct npu2 *npu;
@@ -658,3 +658,5 @@ void probe_npu2(void)
 		setup_devices(npu);
 	}
 }
+
+DEFINE_HWPROBE_DEPS(npu2, probe_npu2, "phb4");
diff --git a/hw/pau.c b/hw/pau.c
index a34d6da..1a3fbfa 100644
--- a/hw/pau.c
+++ b/hw/pau.c
@@ -2074,7 +2074,7 @@ static void pau_init(struct pau *pau)
 	pau_opencapi_init(pau);
 }
 
-void probe_pau(void)
+static void probe_pau(void)
 {
 	struct dt_node *dn;
 	struct pau *pau;
@@ -2093,3 +2093,4 @@ void probe_pau(void)
 		pau_init(pau);
 	}
 }
+DEFINE_HWPROBE_DEPS(pau, probe_pau, "phb4");
diff --git a/hw/phb3.c b/hw/phb3.c
index 09255a0..f46a43c 100644
--- a/hw/phb3.c
+++ b/hw/phb3.c
@@ -4993,7 +4993,7 @@ static void phb3_probe_pbcq(struct dt_node *pbcq)
 }
 
 
-void probe_phb3(void)
+static void probe_phb3(void)
 {
 	struct dt_node *np;
 
@@ -5006,4 +5006,4 @@ void probe_phb3(void)
 		phb3_create(np);
 }
 
-
+DEFINE_HWPROBE(phb3, probe_phb3);
diff --git a/hw/phb4.c b/hw/phb4.c
index 4daad14..f329e13 100644
--- a/hw/phb4.c
+++ b/hw/phb4.c
@@ -6368,7 +6368,7 @@ static void phb4_probe_pbcq(struct dt_node *pbcq)
 	}
 }
 
-void probe_phb4(void)
+static void probe_phb4(void)
 {
 	struct dt_node *np;
 	const char *s;
@@ -6404,3 +6404,5 @@ void probe_phb4(void)
 			phb4_create(np);
 	}
 }
+
+DEFINE_HWPROBE(phb4, probe_phb4);