64 lines
2.5 KiB
Diff
64 lines
2.5 KiB
Diff
From b98880e2cf5fd15e4261676760b719963b956a0e Mon Sep 17 00:00:00 2001
|
|
From: Xiaofei Tan <tanxiaofei@huawei.com>
|
|
Date: Mon, 27 Jul 2020 15:38:37 +0800
|
|
Subject: [PATCH 1/3] rasdaemon: delete the duplicate code about the definition
|
|
of hip08 DB fields
|
|
|
|
Delete the duplicate code about the definition of DB fields for hip08 OEM
|
|
event format1 and format2. Because the two OEM event format is the same.
|
|
|
|
Signed-off-By: Xiaofei Tan <tanxiaofei@huawei.com>
|
|
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
|
|
---
|
|
non-standard-hisi_hip08.c | 23 +++++------------------
|
|
1 file changed, 5 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/non-standard-hisi_hip08.c b/non-standard-hisi_hip08.c
|
|
index 8bf10c1..7fc6939 100644
|
|
--- a/non-standard-hisi_hip08.c
|
|
+++ b/non-standard-hisi_hip08.c
|
|
@@ -504,7 +504,7 @@ static char *pcie_local_sub_module_name(uint8_t id)
|
|
}
|
|
|
|
#ifdef HAVE_SQLITE3
|
|
-static const struct db_fields hip08_oem_type1_event_fields[] = {
|
|
+static const struct db_fields hip08_oem_event_fields[] = {
|
|
{ .name = "id", .type = "INTEGER PRIMARY KEY" },
|
|
{ .name = "timestamp", .type = "TEXT" },
|
|
{ .name = "version", .type = "INTEGER" },
|
|
@@ -519,27 +519,14 @@ static const struct db_fields hip08_oem_type1_event_fields[] = {
|
|
|
|
static const struct db_table_descriptor hip08_oem_type1_event_tab = {
|
|
.name = "hip08_oem_type1_event_v2",
|
|
- .fields = hip08_oem_type1_event_fields,
|
|
- .num_fields = ARRAY_SIZE(hip08_oem_type1_event_fields),
|
|
-};
|
|
-
|
|
-static const struct db_fields hip08_oem_type2_event_fields[] = {
|
|
- { .name = "id", .type = "INTEGER PRIMARY KEY" },
|
|
- { .name = "timestamp", .type = "TEXT" },
|
|
- { .name = "version", .type = "INTEGER" },
|
|
- { .name = "soc_id", .type = "INTEGER" },
|
|
- { .name = "socket_id", .type = "INTEGER" },
|
|
- { .name = "nimbus_id", .type = "INTEGER" },
|
|
- { .name = "module_id", .type = "TEXT" },
|
|
- { .name = "sub_module_id", .type = "TEXT" },
|
|
- { .name = "err_severity", .type = "TEXT" },
|
|
- { .name = "regs_dump", .type = "TEXT" },
|
|
+ .fields = hip08_oem_event_fields,
|
|
+ .num_fields = ARRAY_SIZE(hip08_oem_event_fields),
|
|
};
|
|
|
|
static const struct db_table_descriptor hip08_oem_type2_event_tab = {
|
|
.name = "hip08_oem_type2_event_v2",
|
|
- .fields = hip08_oem_type2_event_fields,
|
|
- .num_fields = ARRAY_SIZE(hip08_oem_type2_event_fields),
|
|
+ .fields = hip08_oem_event_fields,
|
|
+ .num_fields = ARRAY_SIZE(hip08_oem_event_fields),
|
|
};
|
|
|
|
static const struct db_fields hip08_pcie_local_event_fields[] = {
|
|
--
|
|
2.7.4
|
|
|