From 5f5aae8940ed7255dfe1b4435ae10a30f2319c7a Mon Sep 17 00:00:00 2001
From: "Daniel R. Carvalho" <odanrc@yahoo.com.br>
Date: Sat, 14 Jan 2023 10:02:16 -0300
Subject: [PATCH] dev: Remove a couple of deprecated namespaces

These namespaces have gone through the deprecation period
and can now be removed: Sinic, SCMI, Ps2, Regs, Keyboard,
Mouse, TxdOp, iGbReg, CopyEngineReg.

Change-Id: Icfaf458bffca2658650318508c0bb376719cf911
Signed-off-by: Daniel R. Carvalho <odanrc@yahoo.com.br>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/67370
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Richard Cooper <richard.cooper@arm.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
---
 src/dev/arm/css/scmi_platform.hh  | 1 -
 src/dev/arm/css/scmi_protocols.hh | 1 -
 src/dev/net/i8254xGBe_defs.hh     | 2 --
 src/dev/net/sinic.cc              | 1 -
 src/dev/net/sinic.hh              | 1 -
 src/dev/net/sinicreg.hh           | 2 --
 src/dev/pci/copy_engine_defs.hh   | 1 -
 src/dev/ps2/types.cc              | 1 -
 src/dev/ps2/types.hh              | 3 ---
 9 files changed, 13 deletions(-)

diff --git a/src/dev/arm/css/scmi_platform.hh b/src/dev/arm/css/scmi_platform.hh
index 581408dde2..92bec89408 100644
--- a/src/dev/arm/css/scmi_platform.hh
+++ b/src/dev/arm/css/scmi_platform.hh
@@ -49,7 +49,6 @@ namespace gem5
 
 class Doorbell;
 
-GEM5_DEPRECATED_NAMESPACE(SCMI, scmi);
 namespace scmi
 {
 
diff --git a/src/dev/arm/css/scmi_protocols.hh b/src/dev/arm/css/scmi_protocols.hh
index 03d6ea4f83..85e157baf2 100644
--- a/src/dev/arm/css/scmi_protocols.hh
+++ b/src/dev/arm/css/scmi_protocols.hh
@@ -46,7 +46,6 @@
 namespace gem5
 {
 
-GEM5_DEPRECATED_NAMESPACE(SCMI, scmi);
 namespace scmi
 {
 
diff --git a/src/dev/net/i8254xGBe_defs.hh b/src/dev/net/i8254xGBe_defs.hh
index 015ca7dee6..ef013a244f 100644
--- a/src/dev/net/i8254xGBe_defs.hh
+++ b/src/dev/net/i8254xGBe_defs.hh
@@ -35,7 +35,6 @@
 namespace gem5
 {
 
-GEM5_DEPRECATED_NAMESPACE(iGbReg, igbreg);
 namespace igbreg
 {
 
@@ -239,7 +238,6 @@ struct TxDesc
     uint64_t d2;
 };
 
-GEM5_DEPRECATED_NAMESPACE(TxdOp, txd_op);
 namespace txd_op
 {
 
diff --git a/src/dev/net/sinic.cc b/src/dev/net/sinic.cc
index c1afb284c0..69a42edb88 100644
--- a/src/dev/net/sinic.cc
+++ b/src/dev/net/sinic.cc
@@ -48,7 +48,6 @@ namespace gem5
 
 using namespace networking;
 
-GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
 namespace sinic
 {
 
diff --git a/src/dev/net/sinic.hh b/src/dev/net/sinic.hh
index 2b0f9fa8cd..adad53b37f 100644
--- a/src/dev/net/sinic.hh
+++ b/src/dev/net/sinic.hh
@@ -45,7 +45,6 @@
 namespace gem5
 {
 
-GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
 namespace sinic
 {
 
diff --git a/src/dev/net/sinicreg.hh b/src/dev/net/sinicreg.hh
index 120b9a194f..47588df71a 100644
--- a/src/dev/net/sinicreg.hh
+++ b/src/dev/net/sinicreg.hh
@@ -59,11 +59,9 @@
 namespace gem5
 {
 
-GEM5_DEPRECATED_NAMESPACE(Sinic, sinic);
 namespace sinic
 {
 
-GEM5_DEPRECATED_NAMESPACE(Regs, registers);
 namespace registers
 {
 
diff --git a/src/dev/pci/copy_engine_defs.hh b/src/dev/pci/copy_engine_defs.hh
index 9e687e3324..107edee77b 100644
--- a/src/dev/pci/copy_engine_defs.hh
+++ b/src/dev/pci/copy_engine_defs.hh
@@ -36,7 +36,6 @@
 namespace gem5
 {
 
-GEM5_DEPRECATED_NAMESPACE(CopyEngineReg, copy_engine_reg);
 namespace copy_engine_reg
 {
 
diff --git a/src/dev/ps2/types.cc b/src/dev/ps2/types.cc
index 99e740e246..00e442e209 100644
--- a/src/dev/ps2/types.cc
+++ b/src/dev/ps2/types.cc
@@ -45,7 +45,6 @@
 namespace gem5
 {
 
-GEM5_DEPRECATED_NAMESPACE(Ps2, ps2);
 namespace ps2
 {
 
diff --git a/src/dev/ps2/types.hh b/src/dev/ps2/types.hh
index 4ad7b05886..3286c97f57 100644
--- a/src/dev/ps2/types.hh
+++ b/src/dev/ps2/types.hh
@@ -53,7 +53,6 @@
 namespace gem5
 {
 
-GEM5_DEPRECATED_NAMESPACE(Ps2, ps2);
 namespace ps2
 {
 
@@ -70,7 +69,6 @@ enum
     Reset              = 0xFF,
 };
 
-GEM5_DEPRECATED_NAMESPACE(Keyboard, keyboard);
 namespace keyboard
 {
 
@@ -93,7 +91,6 @@ extern const std::vector<uint8_t> ID;
 
 } // namespace keyboard
 
-GEM5_DEPRECATED_NAMESPACE(Mouse, mouse);
 namespace mouse
 {