Skip to contentSkip to conversation

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

PATCH Applied Andy Shevchenko 3 participants 4 messages Apr 7, 2025 – Apr 17, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 MAINTAINERS                                   | 2 +-
 arch/x86/pci/Makefile                         | 6 +++---
 arch/x86/pci/{intel_mid_pci.c => intel_mid.c} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/x86/pci/{intel_mid_pci.c => intel_mid.c} (100%)
MAINTAINERS +1 -1
index 96b827049501..1f6514d55b17 100644
@@ -12120,7 +12120,7 @@ M:	Andy Shevchenko <[email protected]>
 L:	[email protected]
 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
arch/x86/pci/Makefile +3 -3
index 4933fb337983..c1efd5b0d198 100644
@@ -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
arch/x86/pci/intel_mid.c renamed from arch/x86/pci/intel_mid_pci.c +0 -0
similarity index 100%
rename from arch/x86/pci/intel_mid_pci.c
rename to arch/x86/pci/intel_mid.c
Signature · 1 line
2.47.2
Acked-by on v1 1/1
#1 lore raw
Quoted 6 lines · Andy Shevchenko

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.

Quoted 7 lines
---
 MAINTAINERS                                   | 2 +-
 arch/x86/pci/Makefile                         | 6 +++---
 arch/x86/pci/{intel_mid_pci.c => intel_mid.c} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/x86/pci/{intel_mid_pci.c => intel_mid.c} (100%)

Thanks,

Ingo

#2 lore raw
Quoted 17 lines · Ingo Molnar
Quoted 6 lines · Andy Shevchenko

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.

Quoted 7 lines
---
 MAINTAINERS                                   | 2 +-
 arch/x86/pci/Makefile                         | 6 +++---
 arch/x86/pci/{intel_mid_pci.c => intel_mid.c} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/x86/pci/{intel_mid_pci.c => intel_mid.c} (100%)
Quoted 1 line

Thanks!
I believe it's Bjorn who is going to apply?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
#3 lore raw
In reply to Andy Shevchenko
Quoted 7 lines · Andy Shevchenko

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.

Applied to pci/misc for v6.16, thanks!

Quoted 48 lines
---
 MAINTAINERS                                   | 2 +-
 arch/x86/pci/Makefile                         | 6 +++---
 arch/x86/pci/{intel_mid_pci.c => intel_mid.c} | 0
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename arch/x86/pci/{intel_mid_pci.c => intel_mid.c} (100%)
MAINTAINERS +1 -1
index 96b827049501..1f6514d55b17 100644
@@ -12120,7 +12120,7 @@ M:	Andy Shevchenko <[email protected]>
 L:	[email protected]
 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
arch/x86/pci/Makefile +3 -3
index 4933fb337983..c1efd5b0d198 100644
@@ -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
arch/x86/pci/intel_mid.c renamed from arch/x86/pci/intel_mid_pci.c +0 -0
similarity index 100%
rename from arch/x86/pci/intel_mid_pci.c
rename to arch/x86/pci/intel_mid.c
Signature · 1 line
2.47.2