[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] x86/apei: Fix up headers and MISRA deviations following code removal



Fixes: c6bd6cd2db1e ("x86/apei: Fully remove dead code")
Reported-by: Roger Pau Monné <roger.pau@xxxxxxx>
Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
---
CC: Jan Beulich <jbeulich@xxxxxxxx>
CC: Roger Pau Monné <roger@xxxxxxxxxxxxxx>
CC: Teddy Astie <teddy.astie@xxxxxxxxxx>
CC: Stefano Stabellini <sstabellini@xxxxxxxxxx>
CC: consulting@xxxxxxxxxxx <consulting@xxxxxxxxxxx>
CC: Nicola Vetrini <nicola.vetrini@xxxxxxxxxxx>
---
 automation/eclair_analysis/ECLAIR/deviations.ecl | 4 ----
 docs/misra/deviations.rst                        | 8 --------
 xen/include/acpi/apei.h                          | 6 ------
 3 files changed, 18 deletions(-)

diff --git a/automation/eclair_analysis/ECLAIR/deviations.ecl 
b/automation/eclair_analysis/ECLAIR/deviations.ecl
index 58af4fb5cd15..ad37c98bd5fd 100644
--- a/automation/eclair_analysis/ECLAIR/deviations.ecl
+++ b/automation/eclair_analysis/ECLAIR/deviations.ecl
@@ -252,10 +252,6 @@ Therefore the absence of prior declarations is safe."
 -config=MC3A2.R8.4,declarations+={safe, 
"loc(file(asm_defns))&&^current_stack_pointer$"}
 -doc_end
 
--doc_begin="The function apei_(read|check|clear)_mce are dead code and are 
excluded from non-debug builds, therefore the absence of prior declarations is 
safe."
--config=MC3A2.R8.4,declarations+={safe, "^apei_(read|check|clear)_mce\\(.*$"}
--doc_end
-
 -doc_begin="asmlinkage is a marker to indicate that the function is only used 
to interface with asm modules."
 -config=MC3A2.R8.4,declarations+={safe,"loc(text(^(?s).*asmlinkage.*$, 
-1..0))"}
 -doc_end
diff --git a/docs/misra/deviations.rst b/docs/misra/deviations.rst
index c17b44754310..9a00522df288 100644
--- a/docs/misra/deviations.rst
+++ b/docs/misra/deviations.rst
@@ -284,14 +284,6 @@ Deviations related to MISRA C:2012 Rules:
        it.
      - Tagged as `safe` for ECLAIR.
 
-   * - R8.4
-     - Some functions are excluded from non-debug build, therefore the absence
-       of declaration is safe.
-     - Tagged as `safe` for ECLAIR, such functions are:
-         - apei_read_mce()
-         - apei_check_mce()
-         - apei_clear_mce()
-
    * - R8.4
      - Given that bsearch and sort are defined with the attribute 'gnu_inline',
        it's deliberate not to have a prior declaration.
diff --git a/xen/include/acpi/apei.h b/xen/include/acpi/apei.h
index 495819e36234..8e7accbb67d3 100644
--- a/xen/include/acpi/apei.h
+++ b/xen/include/acpi/apei.h
@@ -17,12 +17,6 @@ typedef int (*apei_hest_func_t)(const struct 
acpi_hest_header *hest_hdr,
 int apei_hest_parse(apei_hest_func_t func, void *data);
 
 int erst_write(const struct cper_record_header *record);
-ssize_t erst_get_record_count(void);
-int erst_get_next_record_id(u64 *record_id);
-ssize_t erst_read(u64 record_id, struct cper_record_header *record,
-                 size_t buflen);
-ssize_t erst_read_next(struct cper_record_header *record, size_t buflen);
-int erst_clear(u64 record_id);
 
 void __iomem *apei_pre_map(paddr_t paddr, unsigned long size);
 

base-commit: 69625555f5cdd2d3b83ead3e4fd2bc7b7e819bb3
-- 
2.39.5




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.