x86/PCI: Drop 'pci' suffix from intel_mid_pci.c

CE4100 PCI specific code has no 'pci' suffix in the filename,
intel_mid_pci.c is the only one that duplicates the folder name in its
filename, drop that redundancy.

While at it, group the respective modules in the Makefile.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: Ingo Molnar <mingo@kernel.org>
Link: https://patch.msgid.link/20250407070321.3761063-1-andriy.shevchenko@linux.intel.com

diff --git a/MAINTAINERS b/MAINTAINERS
index 96b82704950184bd71623ff41fc4df31e4c7fe87..1f6514d55b1747c19f11f3b8a69117e19d26f58d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -12120,7 +12120,7 @@ M:      Andy Shevchenko <andy@kernel.org>
 L:     linux-kernel@vger.kernel.org
 S:     Supported
 F:     arch/x86/include/asm/intel-mid.h
-F:     arch/x86/pci/intel_mid_pci.c
+F:     arch/x86/pci/intel_mid.c
 F:     arch/x86/platform/intel-mid/
 F:     drivers/dma/hsu/
 F:     drivers/extcon/extcon-intel-mrfld.c

diff --git a/arch/x86/pci/Makefile b/arch/x86/pci/Makefile
index 4933fb33798322626005211212fb2e795f716aae..c1efd5b0d1982969f1f0fd13bd2abad7bbb3c87e 100644 (file)
--- a/arch/x86/pci/Makefile
+++ b/arch/x86/pci/Makefile
@@ -8,13 +8,13 @@ obj-$(CONFIG_PCI_OLPC)                += olpc.o
 obj-$(CONFIG_PCI_XEN)          += xen.o
 
 obj-y                          += fixup.o
-obj-$(CONFIG_X86_INTEL_CE)      += ce4100.o
 obj-$(CONFIG_ACPI)             += acpi.o
 obj-y                          += legacy.o irq.o
 
-obj-$(CONFIG_X86_NUMACHIP)     += numachip.o
+obj-$(CONFIG_X86_INTEL_CE)     += ce4100.o
+obj-$(CONFIG_X86_INTEL_MID)    += intel_mid.o
 
-obj-$(CONFIG_X86_INTEL_MID)    += intel_mid_pci.o
+obj-$(CONFIG_X86_NUMACHIP)     += numachip.o
 
 obj-y                          += common.o early.o
 obj-y                          += bus_numa.o

diff --git a/arch/x86/pci/intel_mid_pci.c b/arch/x86/pci/intel_mid.c
similarity index 100%
rename from arch/x86/pci/intel_mid_pci.c
rename to arch/x86/pci/intel_mid.c