EDAC: Remove edac_err_assert

... and the glue around it. It is not needed anymore.

Signed-off-by: Borislav Petkov <bp@suse.de>

3 files changed, 1 insertions, 21 deletions

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 824d31193b69..482b6aea1ce7 100644
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -505,22 +505,6 @@ struct mem_ctl_info *find_mci_by_dev(struct device *dev)
 EXPORT_SYMBOL_GPL(find_mci_by_dev);
 
 /*
- * handler for EDAC to check if NMI type handler has asserted interrupt
- */
-static int edac_mc_assert_error_check_and_clear(void)
-{
-        int old_state;
-
-        if (edac_op_state == EDAC_OPSTATE_POLL)
-                return 1;
-
-        old_state = edac_err_assert;
-        edac_err_assert = 0;
-
-        return old_state;
-}
-
-/*
  * edac_mc_workq_function
  *      performs the operation scheduled by a workq request
  */
@@ -536,7 +520,7 @@ static void edac_mc_workq_function(struct work_struct *work_req)
                 return;
         }
 
-        if (edac_mc_assert_error_check_and_clear())
+        if (edac_op_state == EDAC_OPSTATE_POLL)
                 mci->edac_check(mci);
 
         mutex_unlock(&mem_ctls_mutex);
diff --git a/drivers/edac/edac_stub.c b/drivers/edac/edac_stub.c
index cfb250fa38ce..f02d21d8130f 100644
--- a/drivers/edac/edac_stub.c
+++ b/drivers/edac/edac_stub.c
@@ -20,9 +20,6 @@
 int edac_op_state = EDAC_OPSTATE_INVAL;
 EXPORT_SYMBOL_GPL(edac_op_state);
 
-int edac_err_assert = 0;
-EXPORT_SYMBOL_GPL(edac_err_assert);
-
 int edac_report_status = EDAC_REPORTING_ENABLED;
 EXPORT_SYMBOL_GPL(edac_report_status);
 
diff --git a/include/linux/edac.h b/include/linux/edac.h
index 9fd6fe53ab2a..c55e93975079 100644
--- a/include/linux/edac.h
+++ b/include/linux/edac.h
@@ -28,7 +28,6 @@ struct device;
 #define EDAC_OPSTATE_INT        2
 
 extern int edac_op_state;
-extern int edac_err_assert;
 
 extern struct bus_type *edac_get_sysfs_subsys(void);