Преглед изворни кода

EDAC: Remove edac_err_assert

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

Signed-off-by: Borislav Petkov <bp@suse.de>
Borislav Petkov пре 8 година
родитељ
комит
d3116a0837
3 измењених фајлова са 1 додато и 21 уклоњено
  1. 1 17
      drivers/edac/edac_mc.c
  2. 0 3
      drivers/edac/edac_stub.c
  3. 0 1
      include/linux/edac.h

+ 1 - 17
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);
 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
  * edac_mc_workq_function
  *	performs the operation scheduled by a workq request
  *	performs the operation scheduled by a workq request
@@ -536,7 +520,7 @@ static void edac_mc_workq_function(struct work_struct *work_req)
 		return;
 		return;
 	}
 	}
 
 
-	if (edac_mc_assert_error_check_and_clear())
+	if (edac_op_state == EDAC_OPSTATE_POLL)
 		mci->edac_check(mci);
 		mci->edac_check(mci);
 
 
 	mutex_unlock(&mem_ctls_mutex);
 	mutex_unlock(&mem_ctls_mutex);

+ 0 - 3
drivers/edac/edac_stub.c

@@ -20,9 +20,6 @@
 int edac_op_state = EDAC_OPSTATE_INVAL;
 int edac_op_state = EDAC_OPSTATE_INVAL;
 EXPORT_SYMBOL_GPL(edac_op_state);
 EXPORT_SYMBOL_GPL(edac_op_state);
 
 
-int edac_err_assert = 0;
-EXPORT_SYMBOL_GPL(edac_err_assert);
-
 int edac_report_status = EDAC_REPORTING_ENABLED;
 int edac_report_status = EDAC_REPORTING_ENABLED;
 EXPORT_SYMBOL_GPL(edac_report_status);
 EXPORT_SYMBOL_GPL(edac_report_status);
 
 

+ 0 - 1
include/linux/edac.h

@@ -28,7 +28,6 @@ struct device;
 #define EDAC_OPSTATE_INT	2
 #define EDAC_OPSTATE_INT	2
 
 
 extern int edac_op_state;
 extern int edac_op_state;
-extern int edac_err_assert;
 
 
 extern struct bus_type *edac_get_sysfs_subsys(void);
 extern struct bus_type *edac_get_sysfs_subsys(void);