From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 12 Mar 2024 17:14:23 +0000 (-0500)
Subject: Merge branch 'pci/sysfs'
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b8de187056f10f31739cad3d7b66677415f79883;p=linux.git

Merge branch 'pci/sysfs'

- Compile pci-sysfs.c only if CONFIG_SYSFS=y, which reduces kernel size by
  ~120KB when it's disabled (Lukas Wunner)

- Remove obsolete pci_cleanup_rom() declaration (Lukas Wunner)

- Rework pci_dev_resource_resize_attr(n) macros to call a function instead
  of duplicating most of the body, which saves about 2.5KB of text (Ilpo
  Järvinen)

* pci/sysfs:
  PCI/sysfs: Demacrofy pci_dev_resource_resize_attr(n) functions
  PCI: Remove obsolete pci_cleanup_rom() declaration
  PCI/sysfs: Compile pci-sysfs.c only if CONFIG_SYSFS=y

# Conflicts:
#	drivers/pci/Makefile
---

b8de187056f10f31739cad3d7b66677415f79883
diff --cc drivers/pci/Makefile
index 147779831b130,96f4759f2bd31..1753020368909
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@@ -4,17 -4,16 +4,17 @@@
  
  obj-$(CONFIG_PCI)		+= access.o bus.o probe.o host-bridge.o \
  				   remove.o pci.o pci-driver.o search.o \
- 				   pci-sysfs.o rom.o setup-res.o irq.o vpd.o \
+ 				   rom.o setup-res.o irq.o vpd.o \
 -				   setup-bus.o vc.o mmap.o setup-irq.o
 +				   setup-bus.o vc.o mmap.o devres.o
  
  obj-$(CONFIG_PCI)		+= msi/
  obj-$(CONFIG_PCI)		+= pcie/
  
  ifdef CONFIG_PCI
  obj-$(CONFIG_PROC_FS)		+= proc.o
- obj-$(CONFIG_SYSFS)		+= slot.o
+ obj-$(CONFIG_SYSFS)		+= pci-sysfs.o slot.o
  obj-$(CONFIG_ACPI)		+= pci-acpi.o
 +obj-$(CONFIG_GENERIC_PCI_IOMAP) += iomap.o
  endif
  
  obj-$(CONFIG_OF)		+= of.o