EDAC: Remove edac_err_assert

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

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

diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c
index 824d31193b694af2cb298f7b8961e3ed885b1bec..482b6aea1ce76f94c8c5834934f35965ef5d8d36 100644 (file)
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
@@ -504,22 +504,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 cfb250fa38ce99a32f0fbe2b4aa0e3c9ebbe8576..f02d21d8130f97f85c51a2937ea03414a4d7fba3 100644 (file)
--- 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 9fd6fe53ab2a5f4c28438175e590c1a431c3ffcd..c55e93975079d2ae76603e51b9f6f1428899b476 100644 (file)
--- 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);