Skip to content

Commit 98f2fc8

Browse files
qzhuo2suryasaimadhu
authored andcommitted
EDAC, skx_edac: Delete duplicated code
Delete the duplicated code from skx_edac.c and rename skx_edac.c to skx_base.c. Update the Makefile to build the skx_edac driver from skx_base.c and skx_common.c. Add SPDX to skx_base.c and clean out unnecessary #include lines. [ bp: Drop the license boilerplate - there's an SPDX identifier now. ] Co-developed-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Qiuxu Zhuo <qiuxu.zhuo@intel.com> Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: James Morse <james.morse@arm.com> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: linux-edac <linux-edac@vger.kernel.org> Link: https://lkml.kernel.org/r/20190130191519.15393-4-tony.luck@intel.com
1 parent 88a242c commit 98f2fc8

File tree

3 files changed

+653
-1359
lines changed

3 files changed

+653
-1359
lines changed

drivers/edac/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ obj-$(CONFIG_EDAC_I5400) += i5400_edac.o
3030
obj-$(CONFIG_EDAC_I7300) += i7300_edac.o
3131
obj-$(CONFIG_EDAC_I7CORE) += i7core_edac.o
3232
obj-$(CONFIG_EDAC_SBRIDGE) += sb_edac.o
33-
obj-$(CONFIG_EDAC_SKX) += skx_edac.o
3433
obj-$(CONFIG_EDAC_PND2) += pnd2_edac.o
3534
obj-$(CONFIG_EDAC_E7XXX) += e7xxx_edac.o
3635
obj-$(CONFIG_EDAC_E752X) += e752x_edac.o
@@ -58,6 +57,9 @@ obj-$(CONFIG_EDAC_MPC85XX) += mpc85xx_edac_mod.o
5857
layerscape_edac_mod-y := fsl_ddr_edac.o layerscape_edac.o
5958
obj-$(CONFIG_EDAC_LAYERSCAPE) += layerscape_edac_mod.o
6059

60+
skx_edac-y := skx_common.o skx_base.o
61+
obj-$(CONFIG_EDAC_SKX) += skx_edac.o
62+
6163
obj-$(CONFIG_EDAC_MV64X60) += mv64x60_edac.o
6264
obj-$(CONFIG_EDAC_CELL) += cell_edac.o
6365
obj-$(CONFIG_EDAC_PPC4XX) += ppc4xx_edac.o

0 commit comments

Comments
 (0)