aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2013-12-15 11:29:44 -0500
committerBorislav Petkov <bp@suse.de>2013-12-15 11:29:44 -0500
commitdf781d0386a3e29c31f1d8eaf845b3224e65dd7f (patch)
treeac231a7dde744178da9734dff378a444bbf9caf5 /drivers/edac
parent79db57cef949cfd0fe7f53e30666bd6945ec400a (diff)
amd64_edac: Simplify code around decode_bus_error
Drop wrapper function and prefixes. Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'drivers/edac')
-rw-r--r--drivers/edac/amd64_edac.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/edac/amd64_edac.c b/drivers/edac/amd64_edac.c
index 6b2542e102e1..568e97fc1489 100644
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
@@ -2005,9 +2005,9 @@ static void __log_bus_error(struct mem_ctl_info *mci, struct err_info *err,
2005 string, ""); 2005 string, "");
2006} 2006}
2007 2007
2008static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci, 2008static inline void decode_bus_error(int node_id, struct mce *m)
2009 struct mce *m)
2010{ 2009{
2010 struct mem_ctl_info *mci = mcis[node_id];
2011 struct amd64_pvt *pvt = mci->pvt_info; 2011 struct amd64_pvt *pvt = mci->pvt_info;
2012 u8 ecc_type = (m->status >> 45) & 0x3; 2012 u8 ecc_type = (m->status >> 45) & 0x3;
2013 u8 xec = XEC(m->status, 0x1f); 2013 u8 xec = XEC(m->status, 0x1f);
@@ -2035,11 +2035,6 @@ static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci,
2035 __log_bus_error(mci, &err, ecc_type); 2035 __log_bus_error(mci, &err, ecc_type);
2036} 2036}
2037 2037
2038static void amd64_decode_bus_error(int node_id, struct mce *m)
2039{
2040 __amd64_decode_bus_error(mcis[node_id], m);
2041}
2042
2043/* 2038/*
2044 * Use pvt->F2 which contains the F2 CPU PCI device to get the related 2039 * Use pvt->F2 which contains the F2 CPU PCI device to get the related
2045 * F1 (AddrMap) and F3 (Misc) devices. Return negative value on error. 2040 * F1 (AddrMap) and F3 (Misc) devices. Return negative value on error.
@@ -2680,7 +2675,7 @@ static int amd64_init_one_instance(struct pci_dev *F2)
2680 if (report_gart_errors) 2675 if (report_gart_errors)
2681 amd_report_gart_errors(true); 2676 amd_report_gart_errors(true);
2682 2677
2683 amd_register_ecc_decoder(amd64_decode_bus_error); 2678 amd_register_ecc_decoder(decode_bus_error);
2684 2679
2685 mcis[nid] = mci; 2680 mcis[nid] = mci;
2686 2681
@@ -2777,7 +2772,7 @@ static void amd64_remove_one_instance(struct pci_dev *pdev)
2777 2772
2778 /* unregister from EDAC MCE */ 2773 /* unregister from EDAC MCE */
2779 amd_report_gart_errors(false); 2774 amd_report_gart_errors(false);
2780 amd_unregister_ecc_decoder(amd64_decode_bus_error); 2775 amd_unregister_ecc_decoder(decode_bus_error);
2781 2776
2782 kfree(ecc_stngs[nid]); 2777 kfree(ecc_stngs[nid]);
2783 ecc_stngs[nid] = NULL; 2778 ecc_stngs[nid] = NULL;