diff --git a/platforms/common/spi.cpp b/platforms/common/spi.cpp
index ca95ada5fe..a2033ff555 100644
--- a/platforms/common/spi.cpp
+++ b/platforms/common/spi.cpp
@@ -47,7 +47,7 @@ void px4_set_spi_buses_from_hw_version()
 #if defined(BOARD_HAS_SIMPLE_HW_VERSIONING)
 	int hw_version_revision = board_get_hw_version();
 #else
-	int hw_version_revision = (board_get_hw_version() << 16) | board_get_hw_revision();
+	int hw_version_revision = HW_VER_REV(board_get_hw_version(), board_get_hw_revision());
 #endif