The prefix marks the files that back a hardware IP block. ACA is a bank
format rather than an IP, and the rest of its files are named after it
alone, so the v5 pair is the odd one out.

Signed-off-by: Xiang Liu <[email protected]>
---
 drivers/gpu/drm/amd/ras/core/Makefile                       | 2 +-
 drivers/gpu/drm/amd/ras/core/aca.c                          | 2 +-
 drivers/gpu/drm/amd/ras/core/{ras_aca_v5_0.c => aca_v5_0.c} | 2 +-
 drivers/gpu/drm/amd/ras/core/{ras_aca_v5_0.h => aca_v5_0.h} | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename drivers/gpu/drm/amd/ras/core/{ras_aca_v5_0.c => aca_v5_0.c} (99%)
 rename drivers/gpu/drm/amd/ras/core/{ras_aca_v5_0.h => aca_v5_0.h} (98%)

diff --git a/drivers/gpu/drm/amd/ras/core/Makefile 
b/drivers/gpu/drm/amd/ras/core/Makefile
index b2872affbf71..fb16bacaef2f 100644
--- a/drivers/gpu/drm/amd/ras/core/Makefile
+++ b/drivers/gpu/drm/amd/ras/core/Makefile
@@ -25,7 +25,7 @@ RAS_CORE_FILES = core.o \
                        ras_mp1_v15_0.o \
                        aca.o  \
                        aca_v1_0.o \
-                       ras_aca_v5_0.o \
+                       aca_v5_0.o \
                        ras_eeprom_mgr.o \
                        eeprom.o \
                        ras_umc.o \
diff --git a/drivers/gpu/drm/amd/ras/core/aca.c 
b/drivers/gpu/drm/amd/ras/core/aca.c
index f316f49c24bd..b40098406174 100644
--- a/drivers/gpu/drm/amd/ras/core/aca.c
+++ b/drivers/gpu/drm/amd/ras/core/aca.c
@@ -25,7 +25,7 @@
 #include "aca.h"
 #include "ras_mce.h"
 #include "aca_v1_0.h"
-#include "ras_aca_v5_0.h"
+#include "aca_v5_0.h"
 #include "ras_mp1_v13_0.h"
 
 #define ACA_MARK_FATAL_FLAG    0x100
diff --git a/drivers/gpu/drm/amd/ras/core/ras_aca_v5_0.c 
b/drivers/gpu/drm/amd/ras/core/aca_v5_0.c
similarity index 99%
rename from drivers/gpu/drm/amd/ras/core/ras_aca_v5_0.c
rename to drivers/gpu/drm/amd/ras/core/aca_v5_0.c
index 2c8dcc5886f3..30fd1cdef94e 100644
--- a/drivers/gpu/drm/amd/ras/core/ras_aca_v5_0.c
+++ b/drivers/gpu/drm/amd/ras/core/aca_v5_0.c
@@ -24,7 +24,7 @@
 #include "ras.h"
 #include "aca.h"
 #include "core_status.h"
-#include "ras_aca_v5_0.h"
+#include "aca_v5_0.h"
 
 #define ACA_HWIP_MAP(ip, hwid, acatypes) \
        {ACA_ECC_HWIP__##ip, hwid, acatypes, ARRAY_SIZE(acatypes)}
diff --git a/drivers/gpu/drm/amd/ras/core/ras_aca_v5_0.h 
b/drivers/gpu/drm/amd/ras/core/aca_v5_0.h
similarity index 98%
rename from drivers/gpu/drm/amd/ras/core/ras_aca_v5_0.h
rename to drivers/gpu/drm/amd/ras/core/aca_v5_0.h
index a3eb6d50cc2f..7f2c296de0b2 100644
--- a/drivers/gpu/drm/amd/ras/core/ras_aca_v5_0.h
+++ b/drivers/gpu/drm/amd/ras/core/aca_v5_0.h
@@ -22,8 +22,8 @@
  *
  */
 
-#ifndef __RAS_ACA_V5_0_H__
-#define __RAS_ACA_V5_0_H__
+#ifndef __ACA_V5_0_H__
+#define __ACA_V5_0_H__
 #include "ras.h"
 
 #define ACA_V5_REG__FIELD(x, h, l)          (((x) & GENMASK_ULL(h, l)) >> l)
-- 
2.34.1

Reply via email to