MIPS: octeon: use of_platform_populate to probe devices

robherring · paulburton · commit f072f9ce9bd3 · 2018-06-24T09:27:27.000-07:00
of_platform_bus_probe is deprecated in favor of of_platform_populate. of_platform_populate is stricter requiring compatible properties for matching rather than name or type. Octeon uses compatible strings for matching, so convert it to of_platform_populate. Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Paul Burton <paul.burton@mips.com> Cc: James Hogan <jhogan@kernel.org> Cc: linux-mips@linux-mips.org Signed-off-by: Rob Herring <robh@kernel.org> Patchwork: https://patchwork.linux-mips.org/patch/19588/ Signed-off-by: Paul Burton <paul.burton@mips.com> Cc: linux-kernel@vger.kernel.org
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c
@@ -1067,6 +1067,6 @@ int __init octeon_prune_device_tree(void)
 
 static int __init octeon_publish_devices(void)
 {
-	return of_platform_bus_probe(NULL, octeon_ids, NULL);
+	return of_platform_populate(NULL, octeon_ids, NULL, NULL);
 }
 arch_initcall(octeon_publish_devices);

Original file line number	Diff line number	Diff line change
`@@ -1067,6 +1067,6 @@ int __init octeon_prune_device_tree(void)`
`1067`	`1067`
`1068`	`1068`	`static int __init octeon_publish_devices(void)`
`1069`	`1069`	`{`
`1070`		`- return of_platform_bus_probe(NULL, octeon_ids, NULL);`
	`1070`	`+ return of_platform_populate(NULL, octeon_ids, NULL, NULL);`
`1071`	`1071`	`}`
`1072`	`1072`	`arch_initcall(octeon_publish_devices);`