diff --git a/example/amd_smi_drm_example.cc b/example/amd_smi_drm_example.cc
index 5405492eaa..47155f7324 100644
--- a/example/amd_smi_drm_example.cc
+++ b/example/amd_smi_drm_example.cc
@@ -342,8 +342,7 @@ int main() {
             ret = amdsmi_get_processor_type(processor_handles[device_index], &processor_type);
             CHK_AMDSMI_RET(ret)
 
-            auto it = processor_type_map.find(processor_type);
-            if (it != processor_type_map.end()) {
+            if (auto it = processor_type_map.find(processor_type); it != processor_type_map.end()) {
               std::cout << "\t**Processor Type: " << it->second << std::endl;
             } else {
               std::cout << "\t**Processor Type: MAP TYPE UNKNOWN?" << std::endl;
@@ -395,9 +394,9 @@ int main() {
               CHK_AMDSMI_RET(ret)
             }
 
-            auto it2 = virtualization_mode_map.find(vmode);
-            if (it2 != virtualization_mode_map.end()) {
-              std::cout << "\t**Virtualization Mode: " << it2->second << std::endl;
+            if (auto it = virtualization_mode_map.find(vmode);
+                it != virtualization_mode_map.end()) {
+              std::cout << "\t**Virtualization Mode: " << it->second << std::endl;
             } else {
               std::cout << "\t**Virtualization Mode: MAP TYPE UNKNOWN?" << std::endl;
             }
diff --git a/src/amd_smi/amd_smi.cc b/src/amd_smi/amd_smi.cc
index 8a92cfdb91..8c9217d076 100644
--- a/src/amd_smi/amd_smi.cc
+++ b/src/amd_smi/amd_smi.cc
@@ -4540,11 +4540,11 @@ amdsmi_get_link_topology_nearest(amdsmi_processor_handle processor_handle,
 
 static const std::map<amdsmi_virtualization_mode_t, std::string>
   virtualization_mode_map = {
-  {AMDSMI_VIRTUALIZATION_MODE_UNKNOWN,      "UNKNOWN"},
-  {AMDSMI_VIRTUALIZATION_MODE_BAREMETAL,    "BAREMETAL"},
-  { AMDSMI_VIRTUALIZATION_MODE_HOST,        "HOST"},
-  { AMDSMI_VIRTUALIZATION_MODE_GUEST,       "GUEST"},
-  {AMDSMI_VIRTUALIZATION_MODE_PASSTHROUGH,  "PASSTHROUGH"}
+  {AMDSMI_VIRTUALIZATION_MODE_UNKNOWN, "UNKNOWN"},
+  {AMDSMI_VIRTUALIZATION_MODE_BAREMETAL, "BAREMETAL"},
+  { AMDSMI_VIRTUALIZATION_MODE_HOST, "HOST"},
+  { AMDSMI_VIRTUALIZATION_MODE_GUEST, "GUEST"},
+  {AMDSMI_VIRTUALIZATION_MODE_PASSTHROUGH, "PASSTHROUGH"}
 };
 
 amdsmi_status_t
diff --git a/src/amd_smi/amd_smi_drm.cc b/src/amd_smi/amd_smi_drm.cc
index 533a5060bd..668c409022 100644
--- a/src/amd_smi/amd_smi_drm.cc
+++ b/src/amd_smi/amd_smi_drm.cc
@@ -212,7 +212,6 @@ amdsmi_status_t AMDSmiDrm::init() {
         bdf.bus_number = static_cast<uint64_t>(((bdf_rocm >> 8) & 0xFF));
         bdf.device_number = static_cast<uint64_t>(((bdf_rocm >> 3) & 0x1F));
         bdf.function_number = static_cast<uint64_t>((bdf_rocm & 0x7));
-        bdf.as_uint = bdf_rocm;
 
         drm_bdfs_.push_back(bdf);
         drm_free_device(&device);
@@ -278,7 +277,7 @@ std::vector<std::string>& AMDSmiDrm::get_drm_paths() {
 }
 
 bool AMDSmiDrm::check_if_drm_is_supported() {
-    return (drm_bdfs_.size() >0) ? true : false;
+    return drm_bdfs_.size() > 0;
 }
 
 std::vector<amdsmi_bdf_t> AMDSmiDrm::get_bdfs() {