diff --git a/include/sbi_utils/mpxy/fdt_mpxy.h b/include/sbi_utils/mpxy/fdt_mpxy.h
index 2ba9d28f..57e0b242 100644
--- a/include/sbi_utils/mpxy/fdt_mpxy.h
+++ b/include/sbi_utils/mpxy/fdt_mpxy.h
@@ -15,11 +15,11 @@
 
 #ifdef CONFIG_FDT_MPXY
 
-void fdt_mpxy_init(const void *fdt);
+int fdt_mpxy_init(const void *fdt);
 
 #else
 
-static inline void fdt_mpxy_init(const void *fdt) { }
+static inline int fdt_mpxy_init(const void *fdt) { return 0; }
 
 #endif
 
diff --git a/lib/utils/mpxy/fdt_mpxy.c b/lib/utils/mpxy/fdt_mpxy.c
index 6984ec74..e6e26145 100644
--- a/lib/utils/mpxy/fdt_mpxy.c
+++ b/lib/utils/mpxy/fdt_mpxy.c
@@ -12,11 +12,7 @@
 /* List of FDT MPXY drivers generated at compile time */
 extern const struct fdt_driver *const fdt_mpxy_drivers[];
 
-void fdt_mpxy_init(const void *fdt)
+int fdt_mpxy_init(const void *fdt)
 {
-	/*
-	 * Platforms might have multiple MPXY devices or might not
-	 * have any MPXY devices so don't fail.
-	 */
-	fdt_driver_init_all(fdt, fdt_mpxy_drivers);
+	return fdt_driver_init_all(fdt, fdt_mpxy_drivers);
 }
diff --git a/platform/generic/platform.c b/platform/generic/platform.c
index 2e856642..47e771ad 100644
--- a/platform/generic/platform.c
+++ b/platform/generic/platform.c
@@ -324,8 +324,7 @@ int generic_mpxy_init(void)
 {
 	const void *fdt = fdt_get_address();
 
-	fdt_mpxy_init(fdt);
-	return 0;
+	return fdt_mpxy_init(fdt);
 }
 
 struct sbi_platform_operations generic_platform_ops = {