openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

amd64_edac: Simplify code around decode_bus_error 

Drop wrapper function and prefixes.

Signed-off-by: Borislav Petkov <bp@suse.de>
This commit is contained in:
Borislav Petkov 2013-12-15 17:29:44 +01:00
parent 79db57cef9
commit df781d0386
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/edac/amd64_edac.c
View File

@ -2005,9 +2005,9 @@ static void __log_bus_error(struct mem_ctl_info *mci, struct err_info *err,
string, ""); string, "");
} }
static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci, static inline void decode_bus_error(int node_id, struct mce *m)
struct mce *m)
{ {
struct mem_ctl_info *mci = mcis[node_id];
struct amd64_pvt *pvt = mci->pvt_info; struct amd64_pvt *pvt = mci->pvt_info;
u8 ecc_type = (m->status >> 45) & 0x3; u8 ecc_type = (m->status >> 45) & 0x3;
u8 xec = XEC(m->status, 0x1f); u8 xec = XEC(m->status, 0x1f);
@ -2035,11 +2035,6 @@ static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci,
__log_bus_error(mci, &err, ecc_type); __log_bus_error(mci, &err, ecc_type);
} }
static void amd64_decode_bus_error(int node_id, struct mce *m)
{
__amd64_decode_bus_error(mcis[node_id], m);
}
/* /*
* Use pvt->F2 which contains the F2 CPU PCI device to get the related * Use pvt->F2 which contains the F2 CPU PCI device to get the related
* F1 (AddrMap) and F3 (Misc) devices. Return negative value on error. * 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)
if (report_gart_errors) if (report_gart_errors)
amd_report_gart_errors(true); amd_report_gart_errors(true);
amd_register_ecc_decoder(amd64_decode_bus_error); amd_register_ecc_decoder(decode_bus_error);
mcis[nid] = mci; mcis[nid] = mci;
@ -2777,7 +2772,7 @@ static void amd64_remove_one_instance(struct pci_dev *pdev)
/* unregister from EDAC MCE */ /* unregister from EDAC MCE */
amd_report_gart_errors(false); amd_report_gart_errors(false);
amd_unregister_ecc_decoder(amd64_decode_bus_error); amd_unregister_ecc_decoder(decode_bus_error);
kfree(ecc_stngs[nid]); kfree(ecc_stngs[nid]);
ecc_stngs[nid] = NULL; ecc_stngs[nid] = NULL;