From 15e335ac3f1225072c3e3b053ffcd25b2e9ccd48 Mon Sep 17 00:00:00 2001
From: "Mario Limonciello (AMD)" <superm1@kernel.org>
Date: Fri, 15 Aug 2025 14:19:13 -0500
Subject: [PATCH] Use nested namespace for amd::smi

Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>


[ROCm/amdsmi commit: faca0222f0c4f54e4d53179ab5d9403b6e8e3681]
---
 projects/amdsmi/src/amd_smi/amd_smi_common.cc     | 8 ++++----
 projects/amdsmi/src/amd_smi/amd_smi_lib_loader.cc | 8 ++++----
 projects/amdsmi/src/amd_smi/amd_smi_socket.cc     | 7 +++----
 projects/amdsmi/src/amd_smi/amd_smi_system.cc     | 7 +++----
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/projects/amdsmi/src/amd_smi/amd_smi_common.cc b/projects/amdsmi/src/amd_smi/amd_smi_common.cc
index 54d2d2a98e..c1d0c30151 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_common.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_common.cc
@@ -25,8 +25,8 @@
 #include "amd_smi/impl/amd_smi_common.h"
 
 
-namespace amd {
-namespace smi {
+
+namespace amd::smi {
 
 amdsmi_status_t rsmi_to_amdsmi_status(rsmi_status_t status) {
     amdsmi_status_t amdsmi_status = AMDSMI_STATUS_MAP_ERROR;
@@ -70,5 +70,5 @@ amdsmi_status_t esmi_to_amdsmi_status(esmi_status_t status) {
 }
 #endif
 
-}  // namespace smi
-}  // namespace amd
+} // namespace amd::smi
+
diff --git a/projects/amdsmi/src/amd_smi/amd_smi_lib_loader.cc b/projects/amdsmi/src/amd_smi/amd_smi_lib_loader.cc
index 314b96acea..ee6b4e7fcf 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_lib_loader.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_lib_loader.cc
@@ -23,8 +23,8 @@
 #include "amd_smi/impl/amd_smi_lib_loader.h"
 #include <iostream>
 
-namespace amd {
-namespace smi {
+
+namespace amd::smi {
 
 AMDSmiLibraryLoader::AMDSmiLibraryLoader(): libHandler_(nullptr) {
 }
@@ -69,5 +69,5 @@ AMDSmiLibraryLoader::~AMDSmiLibraryLoader() {
         unload();
 }
 
-}  // namespace rdc
-}  // namespace amd
+}  // namespace amd::smi
+
diff --git a/projects/amdsmi/src/amd_smi/amd_smi_socket.cc b/projects/amdsmi/src/amd_smi/amd_smi_socket.cc
index 7cff3f916e..b2565bf3e7 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_socket.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_socket.cc
@@ -24,8 +24,7 @@
 #include "amd_smi/impl/amd_smi_socket.h"
 
 
-namespace amd {
-namespace smi {
+namespace amd::smi {
 
 AMDSmiSocket::~AMDSmiSocket() {
     for (uint32_t i = 0; i < processors_.size(); i++) {
@@ -67,6 +66,6 @@ amdsmi_status_t AMDSmiSocket::get_processor_count(processor_type_t type, uint32_
     return ret;
 }
 
-}  // namespace smi
-}  // namespace amd
+} // namespace amd::smi
+
 
diff --git a/projects/amdsmi/src/amd_smi/amd_smi_system.cc b/projects/amdsmi/src/amd_smi/amd_smi_system.cc
index df47eca38f..bd6ea8140d 100644
--- a/projects/amdsmi/src/amd_smi/amd_smi_system.cc
+++ b/projects/amdsmi/src/amd_smi/amd_smi_system.cc
@@ -33,8 +33,7 @@
 #include "rocm_smi/rocm_smi_main.h"
 #include <map>
 
-namespace amd {
-namespace smi {
+namespace amd::smi {
 
 
 #define  AMD_SMI_INIT_FLAG_RESRV_TEST1 0x800000000000000  //!< Reserved for test
@@ -470,5 +469,5 @@ amdsmi_status_t AMDSmiSystem::gpu_index_to_handle(uint32_t gpu_index,
 }
 
 
-}  // namespace smi
-}  // namespace amd
+} // namespace amd::smi
+