amd64_edac: Simplify code around decode_bus_error (df781d03) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/edac/amd64_edac.c

+4 −9

Original line number	Diff line number	Diff line
		@@ -2005,9 +2005,9 @@ static void __log_bus_error(struct mem_ctl_info mci, struct err_info err,
		string, "");
		}

		static inline void __amd64_decode_bus_error(struct mem_ctl_info *mci,
		struct mce *m)
		static inline void decode_bus_error(int node_id, struct mce *m)
		{
		struct mem_ctl_info *mci = mcis[node_id];
		struct amd64_pvt *pvt = mci->pvt_info;
		u8 ecc_type = (m->status >> 45) & 0x3;
		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);
		}

		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
		* 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)
		amd_report_gart_errors(true);

		amd_register_ecc_decoder(amd64_decode_bus_error);
		amd_register_ecc_decoder(decode_bus_error);

		mcis[nid] = mci;

		@@ -2777,7 +2772,7 @@ static void amd64_remove_one_instance(struct pci_dev *pdev)

		/* unregister from EDAC MCE */
		amd_report_gart_errors(false);
		amd_unregister_ecc_decoder(amd64_decode_bus_error);
		amd_unregister_ecc_decoder(decode_bus_error);

		kfree(ecc_stngs[nid]);
		ecc_stngs[nid] = NULL;