EDAC, pci_sysfs: remove unneccessary ifdef around entire file (19ca5a3c) · Commits · 戴 / test

The file edac_pci_sysfs.c is dependent on CONFIG_PCI. This is already modelled in the Makefile, but edac_pci_sysfs.o is still contained in the list of files compiled even without CONFIG_PCI. This change removes edac_pci_sysfs.o from the list of built objects when not having CONFIG_PCI enabled and removes the then-unnecessary ifdef from the source file. Signed-off-by:

Andreas Ruprecht <rupran@einserver.de> Link: http://lkml.kernel.org/r/1407697803-3837-1-git-send-email-rupran@einserver.de Signed-off-by:

Borislav Petkov <bp@suse.de>

drivers/edac/Makefile

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@
		obj-$(CONFIG_EDAC) := edac_stub.o
		obj-$(CONFIG_EDAC_MM_EDAC) += edac_core.o

		edac_core-y := edac_mc.o edac_device.o edac_mc_sysfs.o edac_pci_sysfs.o
		edac_core-y := edac_mc.o edac_device.o edac_mc_sysfs.o
		edac_core-y += edac_module.o edac_device_sysfs.o

		ifdef CONFIG_PCI

drivers/edac/edac_pci_sysfs.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -14,9 +14,6 @@
		#include "edac_core.h"
		#include "edac_module.h"

		/* Turn off this whole feature if PCI is not configured */
		#ifdef CONFIG_PCI

		#define EDAC_PCI_SYMLINK "device"

		/* data variables exported via sysfs */
		@@ -761,5 +758,3 @@ MODULE_PARM_DESC(check_pci_errors,
		module_param(edac_pci_panic_on_pe, int, 0644);
		MODULE_PARM_DESC(edac_pci_panic_on_pe,
		"Panic on PCI Bus Parity error: 0=off 1=on");

		#endif /* CONFIG_PCI */

Admin message