From 92e2857be938ac6cdfab685ef338878cbaeec766 Mon Sep 17 00:00:00 2001
From: "Galantsev, Dmitrii" <dmitrii.galantsev@amd.com>
Date: Fri, 3 Nov 2023 17:47:54 -0500
Subject: [PATCH] Fix issues introduced in
 e89751e2023a5d4ec7c7c32bf0e6ce06cb0f9c42

- std=c++.. is not required because CMAKE_CXX_STANDARD is set
- nullptr check breaks the test because we rely on nullptr as an api for
  checking feature availability.
- enum number setting is unnecessary

Change-Id: I393e6dd3f292b7fa4198302f140c0443ba5e50f5
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>


[ROCm/rocm_smi_lib commit: a099f0682a023803b4a44499171e4c26cc8ec9aa]
---
 projects/rocm-smi-lib/CMakeLists.txt          |  2 +-
 .../rocm-smi-lib/include/rocm_smi/rocm_smi.h  | 24 +++++++++----------
 projects/rocm-smi-lib/src/rocm_smi.cc         |  3 ---
 3 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/projects/rocm-smi-lib/CMakeLists.txt b/projects/rocm-smi-lib/CMakeLists.txt
index 07562c4a8a..d56e4d177b 100755
--- a/projects/rocm-smi-lib/CMakeLists.txt
+++ b/projects/rocm-smi-lib/CMakeLists.txt
@@ -72,7 +72,7 @@ endif()
 
 ## Compiler flags
 set(CMAKE_CXX_FLAGS
- "${CMAKE_CXX_FLAGS} -Wall -Wextra -fno-rtti -std=c++17")
+ "${CMAKE_CXX_FLAGS} -Wall -Wextra -fno-rtti")
 if (${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL "x86_64")
     set(CMAKE_CXX_FLAGS
      "${CMAKE_CXX_FLAGS} -m64 -msse -msse2")
diff --git a/projects/rocm-smi-lib/include/rocm_smi/rocm_smi.h b/projects/rocm-smi-lib/include/rocm_smi/rocm_smi.h
index ea945c91a0..3dc2fbf5b3 100755
--- a/projects/rocm-smi-lib/include/rocm_smi/rocm_smi.h
+++ b/projects/rocm-smi-lib/include/rocm_smi/rocm_smi.h
@@ -363,16 +363,16 @@ typedef rsmi_clk_type_t rsmi_clk_type;
  */
 typedef enum {
   RSMI_COMPUTE_PARTITION_INVALID = 0,
-  RSMI_COMPUTE_PARTITION_CPX = 1,    //!< Core mode (CPX)- Per-chip XCC with
-                                     //!< shared memory
-  RSMI_COMPUTE_PARTITION_SPX  = 2,   //!< Single GPU mode (SPX)- All XCCs work
-                                     //!< together with shared memory
-  RSMI_COMPUTE_PARTITION_DPX  = 3,   //!< Dual GPU mode (DPX)- Half XCCs work
-                                     //!< together with shared memory
-  RSMI_COMPUTE_PARTITION_TPX = 4,    //!< Triple GPU mode (TPX)- One-third XCCs
-                                     //!< work together with shared memory
-  RSMI_COMPUTE_PARTITION_QPX = 5,    //!< Quad GPU mode (QPX)- Quarter XCCs
-                                     //!< work together with shared memory
+  RSMI_COMPUTE_PARTITION_CPX, //!< Core mode (CPX)- Per-chip XCC with
+                              //!< shared memory
+  RSMI_COMPUTE_PARTITION_SPX, //!< Single GPU mode (SPX)- All XCCs work
+                              //!< together with shared memory
+  RSMI_COMPUTE_PARTITION_DPX, //!< Dual GPU mode (DPX)- Half XCCs work
+                              //!< together with shared memory
+  RSMI_COMPUTE_PARTITION_TPX, //!< Triple GPU mode (TPX)- One-third XCCs
+                              //!< work together with shared memory
+  RSMI_COMPUTE_PARTITION_QPX, //!< Quad GPU mode (QPX)- Quarter XCCs
+                              //!< work together with shared memory
 } rsmi_compute_partition_type_t;
 /// \cond Ignore in docs.
 typedef rsmi_compute_partition_type_t rsmi_compute_partition_type;
@@ -680,8 +680,8 @@ typedef enum {
  */
 typedef enum _RSMI_IO_LINK_TYPE {
   RSMI_IOLINK_TYPE_UNDEFINED      = 0,          //!< unknown type.
-  RSMI_IOLINK_TYPE_PCIEXPRESS     = 1,          //!< PCI Express
-  RSMI_IOLINK_TYPE_XGMI           = 2,          //!< XGMI
+  RSMI_IOLINK_TYPE_PCIEXPRESS,                  //!< PCI Express
+  RSMI_IOLINK_TYPE_XGMI,                        //!< XGMI
   RSMI_IOLINK_TYPE_NUMIOLINKTYPES,              //!< Number of IO Link types
   RSMI_IOLINK_TYPE_SIZE           = 0xFFFFFFFF  //!< Max of IO Link types
 } RSMI_IO_LINK_TYPE;
diff --git a/projects/rocm-smi-lib/src/rocm_smi.cc b/projects/rocm-smi-lib/src/rocm_smi.cc
index 8749b13213..566b087da3 100755
--- a/projects/rocm-smi-lib/src/rocm_smi.cc
+++ b/projects/rocm-smi-lib/src/rocm_smi.cc
@@ -2776,9 +2776,6 @@ rsmi_dev_od_volt_info_get(uint32_t dv_ind, rsmi_od_volt_freq_data_t *odv) {
   ss << __PRETTY_FUNCTION__ << "| ======= start =======";
   LOG_TRACE(ss);
   DEVICE_MUTEX
-  if (odv == nullptr) {
-    return RSMI_STATUS_INVALID_ARGS;
-  }
   CHK_SUPPORT_NAME_ONLY(odv)
   rsmi_status_t ret = get_od_clk_volt_info(dv_ind, odv);