From 84ae2b6f00d7fdcf8bde9f068abb285ccd92bbe2 Mon Sep 17 00:00:00 2001
From: Andreas Kling <kling@serenityos.org>
Date: Sun, 11 Jul 2021 01:36:30 +0200
Subject: [PATCH] Kernel: Use nested namespace declarations in ACPI code

---
 Kernel/ACPI/Definitions.h     | 6 +-----
 Kernel/ACPI/DynamicParser.cpp | 4 +---
 Kernel/ACPI/DynamicParser.h   | 5 ++---
 Kernel/ACPI/Initialize.cpp    | 4 +---
 Kernel/ACPI/Initialize.h      | 4 +---
 Kernel/ACPI/Parser.cpp        | 4 +---
 Kernel/ACPI/Parser.h          | 4 +---
 7 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/Kernel/ACPI/Definitions.h b/Kernel/ACPI/Definitions.h
index d4f5ce79bf..a35f26603d 100644
--- a/Kernel/ACPI/Definitions.h
+++ b/Kernel/ACPI/Definitions.h
@@ -11,9 +11,7 @@
 #include <AK/Vector.h>
 #include <Kernel/PhysicalAddress.h>
 
-namespace Kernel {
-
-namespace ACPI {
+namespace Kernel::ACPI {
 
 namespace FADTFlags {
 
@@ -327,5 +325,3 @@ PhysicalAddress find_table(PhysicalAddress rsdp, const StringView& signature);
 }
 
 }
-
-}
diff --git a/Kernel/ACPI/DynamicParser.cpp b/Kernel/ACPI/DynamicParser.cpp
index b2d9f1aa59..1a08a7f798 100644
--- a/Kernel/ACPI/DynamicParser.cpp
+++ b/Kernel/ACPI/DynamicParser.cpp
@@ -8,8 +8,7 @@
 #include <Kernel/ACPI/Parser.h>
 #include <Kernel/Sections.h>
 
-namespace Kernel {
-namespace ACPI {
+namespace Kernel::ACPI {
 
 UNMAP_AFTER_INIT DynamicParser::DynamicParser(PhysicalAddress rsdp)
     : IRQHandler(9)
@@ -57,4 +56,3 @@ void DynamicParser::build_namespace()
 }
 
 }
-}
diff --git a/Kernel/ACPI/DynamicParser.h b/Kernel/ACPI/DynamicParser.h
index f2c61176e3..3bf467718e 100644
--- a/Kernel/ACPI/DynamicParser.h
+++ b/Kernel/ACPI/DynamicParser.h
@@ -13,8 +13,7 @@
 #include <Kernel/PhysicalAddress.h>
 #include <Kernel/VM/PhysicalPage.h>
 
-namespace Kernel {
-namespace ACPI {
+namespace Kernel::ACPI {
 
 class DynamicParser final
     : public IRQHandler
@@ -40,5 +39,5 @@ private:
 
     OwnPtr<Region> m_acpi_namespace;
 };
-}
+
 }
diff --git a/Kernel/ACPI/Initialize.cpp b/Kernel/ACPI/Initialize.cpp
index 9b40ceaa01..dd1d0e11fd 100644
--- a/Kernel/ACPI/Initialize.cpp
+++ b/Kernel/ACPI/Initialize.cpp
@@ -9,8 +9,7 @@
 #include <Kernel/CommandLine.h>
 #include <Kernel/Sections.h>
 
-namespace Kernel {
-namespace ACPI {
+namespace Kernel::ACPI {
 
 UNMAP_AFTER_INIT void initialize()
 {
@@ -34,4 +33,3 @@ bool is_enabled()
 }
 
 }
-}
diff --git a/Kernel/ACPI/Initialize.h b/Kernel/ACPI/Initialize.h
index b086c27a09..4bf3946c29 100644
--- a/Kernel/ACPI/Initialize.h
+++ b/Kernel/ACPI/Initialize.h
@@ -6,11 +6,9 @@
 
 #pragma once
 
-namespace Kernel {
-namespace ACPI {
+namespace Kernel::ACPI {
 
 bool is_enabled();
 void initialize();
 
 }
-}
diff --git a/Kernel/ACPI/Parser.cpp b/Kernel/ACPI/Parser.cpp
index da449b4831..768acd27d6 100644
--- a/Kernel/ACPI/Parser.cpp
+++ b/Kernel/ACPI/Parser.cpp
@@ -17,8 +17,7 @@
 #include <Kernel/StdLib.h>
 #include <Kernel/VM/TypedMapping.h>
 
-namespace Kernel {
-namespace ACPI {
+namespace Kernel::ACPI {
 
 static Parser* s_acpi_parser;
 
@@ -459,4 +458,3 @@ void Parser::disable_aml_interpretation()
 }
 
 }
-}
diff --git a/Kernel/ACPI/Parser.h b/Kernel/ACPI/Parser.h
index 8fa5b589c7..44d44f7da1 100644
--- a/Kernel/ACPI/Parser.h
+++ b/Kernel/ACPI/Parser.h
@@ -14,8 +14,7 @@
 #include <Kernel/VM/Region.h>
 #include <Kernel/VirtualAddress.h>
 
-namespace Kernel {
-namespace ACPI {
+namespace Kernel::ACPI {
 
 class ACPISysFSDirectory : public SysFSDirectory {
 public:
@@ -106,4 +105,3 @@ private:
 };
 
 }
-}