Skip to content

Commit

Permalink
EDAC: Remove edac_err_assert
Browse files Browse the repository at this point in the history
... and the glue around it. It is not needed anymore.

Signed-off-by: Borislav Petkov <bp@suse.de>
  • Loading branch information
Borislav Petkov committed Apr 10, 2017
1 parent 97bb6c1 commit d3116a0
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 21 deletions.
18 changes: 1 addition & 17 deletions drivers/edac/edac_mc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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);
Expand Down
3 changes: 0 additions & 3 deletions drivers/edac/edac_stub.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
1 change: 0 additions & 1 deletion include/linux/edac.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down

0 comments on commit d3116a0

Please sign in to comment.