From 38ac3759b844750a004b9ed7c77f91b94a6a789c Mon Sep 17 00:00:00 2001 From: Shiju Jose Date: Mon, 17 Jun 2019 15:28:49 +0100 Subject: [PATCH] rasdaemon: update iteration logic for the non-standard error decoding functions This patch updates the iteration logic for the non-standard error decoding functions. Suggested-by: Jonathan Cameron Signed-off-by: Shiju Jose Signed-off-by: Mauro Carvalho Chehab --- non-standard-hisi_hip07.c | 2 +- ras-non-standard-handler.c | 2 +- ras-non-standard-handler.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/non-standard-hisi_hip07.c b/non-standard-hisi_hip07.c index 19a5c47..bb2576e 100644 --- a/non-standard-hisi_hip07.c +++ b/non-standard-hisi_hip07.c @@ -134,11 +134,11 @@ struct ras_ns_dec_tab hisi_ns_dec_tab[] = { .sec_type = "fbc2d923ea7a453dab132949f5af9e53", .decode = decode_hip07_hns_error, }, + { /* sentinel */ } }; __attribute__((constructor)) static void hip07_init(void) { - hisi_ns_dec_tab[0].len = ARRAY_SIZE(hisi_ns_dec_tab); register_ns_dec_tab(hisi_ns_dec_tab); } diff --git a/ras-non-standard-handler.c b/ras-non-standard-handler.c index d343a2a..392bb27 100644 --- a/ras-non-standard-handler.c +++ b/ras-non-standard-handler.c @@ -163,7 +163,7 @@ int ras_non_standard_event_handler(struct trace_seq *s, for (count = 0; count < dec_tab_count && !dec_done; count++) { dec_tab = ns_dec_tab[count]; - for (i = 0; i < dec_tab[0].len; i++) { + for (i = 0; dec_tab[i].decode; i++) { if (uuid_le_cmp(ev.sec_type, dec_tab[i].sec_type) == 0) { dec_tab[i].decode(s, ev.error); diff --git a/ras-non-standard-handler.h b/ras-non-standard-handler.h index b9e9fb1..b2c9743 100644 --- a/ras-non-standard-handler.h +++ b/ras-non-standard-handler.h @@ -23,7 +23,6 @@ typedef struct ras_ns_dec_tab { const char *sec_type; int (*decode)(struct trace_seq *s, const void *err); - size_t len; } *p_ns_dec_tab; int ras_non_standard_event_handler(struct trace_seq *s, -- 2.50.1