47 lines
1.5 KiB
Diff
47 lines
1.5 KiB
Diff
|
From 1d83921b5ad4dc03a411abf759c1025e548ce3e0 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Bing Xia <xiabing14@h-partners.com>
|
||
|
|
Date: Sun, 19 Jan 2025 11:26:43 +0000
|
||
|
|
Subject: [PATCH 2/4] rasdaemon: Fix few compilation warnings in non standard
|
||
|
|
hisilicon code
|
||
|
|
|
||
|
|
Fix the problem that the type of a constant string does not match
|
||
|
|
when it is assigned to a character pointer.
|
||
|
|
|
||
|
|
Signed-off-by: Bing Xia <xiabing14@h-partners.com>
|
||
|
|
Signed-off-by: Shiju Jose <shiju.jose@huawei.com>
|
||
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
|
||
|
|
---
|
||
|
|
non-standard-hisi_hip08.c | 2 +-
|
||
|
|
non-standard-hisilicon.h | 2 +-
|
||
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/non-standard-hisi_hip08.c b/non-standard-hisi_hip08.c
|
||
|
|
index de5b5e9..3b8d93c 100644
|
||
|
|
--- a/non-standard-hisi_hip08.c
|
||
|
|
+++ b/non-standard-hisi_hip08.c
|
||
|
|
@@ -462,7 +462,7 @@ static const char * const oem_submodule_name(const struct hisi_module_info *info
|
||
|
|
return "unknown";
|
||
|
|
}
|
||
|
|
|
||
|
|
-static char *pcie_local_sub_module_name(uint8_t id)
|
||
|
|
+static const char *pcie_local_sub_module_name(uint8_t id)
|
||
|
|
{
|
||
|
|
switch (id) {
|
||
|
|
case HISI_PCIE_SUB_MODULE_ID_AP: return "AP_Layer";
|
||
|
|
diff --git a/non-standard-hisilicon.h b/non-standard-hisilicon.h
|
||
|
|
index 44da9e7..afd5e83 100644
|
||
|
|
--- a/non-standard-hisilicon.h
|
||
|
|
+++ b/non-standard-hisilicon.h
|
||
|
|
@@ -24,7 +24,7 @@ enum hisi_oem_data_type {
|
||
|
|
};
|
||
|
|
|
||
|
|
/* helper functions */
|
||
|
|
-static inline char *err_severity(uint8_t err_sev)
|
||
|
|
+static inline const char *err_severity(uint8_t err_sev)
|
||
|
|
{
|
||
|
|
switch (err_sev) {
|
||
|
|
case HISI_ERR_SEVERITY_NFE: return "recoverable";
|
||
|
|
--
|
||
|
|
2.25.1
|
||
|
|
|