[PATCH v8 18/25] PCI/sysfs: Remove pci_{create,remove}_sysfs_dev_files()
From: Krzysztof Wilczyński <kwilczynski@kernel.org>
Date: 2026-06-19 08:53:10
Also in:
linux-alpha, linux-pci
Subsystem:
pci subsystem, the rest · Maintainers:
Bjorn Helgaas, Linus Torvalds
Currently, pci_create_sysfs_dev_files() and pci_remove_sysfs_dev_files() are no-op stubs. With both the generic and Alpha resource files now handled by static attribute groups, no platform needs dynamic per-device sysfs file creation. Thus, remove both functions, their declarations, and the call sites in pci_bus_add_device() and pci_stop_dev(). Remove __weak pci_create_resource_files() and pci_remove_resource_files() stubs and their declarations in pci.h, as no architecture overrides them anymore. Remove the res_attr[] and res_attr_wc[] fields from struct pci_dev which were used to track dynamically allocated resource attributes. Finally, simplify pci_sysfs_init() to only handle legacy file creation under HAVE_PCI_LEGACY, removing the per-device loop and the HAVE_PCI_SYSFS_INIT helper added earlier. Tested-by: Shivaprasad G Bhat <redacted> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org> --- drivers/pci/bus.c | 1 - drivers/pci/pci-sysfs.c | 52 ++--------------------------------------- drivers/pci/pci.h | 4 ---- drivers/pci/remove.c | 1 - include/linux/pci.h | 9 ------- 5 files changed, 2 insertions(+), 65 deletions(-)
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index 6c1ad1f542d9..655ed53436d3 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c@@ -354,7 +354,6 @@ void pci_bus_add_device(struct pci_dev *dev) pci_fixup_device(pci_fixup_final, dev); if (pci_is_bridge(dev)) of_pci_make_dev_node(dev); - pci_create_sysfs_dev_files(dev); pci_proc_attach_device(dev); pci_bridge_d3_update(dev);
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index 57d89e12bfec..9d1378700c3a 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c@@ -37,12 +37,7 @@ #define ARCH_PCI_DEV_GROUPS #endif -#if defined(HAVE_PCI_LEGACY) || \ - !defined(HAVE_PCI_MMAP) && !defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) -#define HAVE_PCI_SYSFS_INIT -#endif - -#ifdef HAVE_PCI_SYSFS_INIT +#ifdef HAVE_PCI_LEGACY static int sysfs_initialized; /* = 0 */ #endif
@@ -1377,8 +1372,6 @@ static const struct attribute_group *pci_dev_resource_attr_groups[] = { }; #else #define pci_dev_resource_attr_groups NULL -int __weak pci_create_resource_files(struct pci_dev *dev) { return 0; } -void __weak pci_remove_resource_files(struct pci_dev *dev) { } #endif /**
@@ -1748,54 +1741,13 @@ static const struct attribute_group pci_dev_resource_resize_attr_group = { .is_visible = resource_resize_attr_is_visible, }; -#if defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) -int pci_create_sysfs_dev_files(struct pci_dev *pdev) { return 0; } -void pci_remove_sysfs_dev_files(struct pci_dev *pdev) { } -#else -int __must_check pci_create_sysfs_dev_files(struct pci_dev *pdev) -{ - if (!sysfs_initialized) - return -EACCES; - - return pci_create_resource_files(pdev); -} - -/** - * pci_remove_sysfs_dev_files - cleanup PCI specific sysfs files - * @pdev: device whose entries we should free - * - * Cleanup when @pdev is removed from sysfs. - */ -void pci_remove_sysfs_dev_files(struct pci_dev *pdev) -{ - if (!sysfs_initialized) - return; - - pci_remove_resource_files(pdev); -} -#endif - -#ifdef HAVE_PCI_SYSFS_INIT +#ifdef HAVE_PCI_LEGACY static int __init pci_sysfs_init(void) { -#if defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) struct pci_bus *pbus = NULL; sysfs_initialized = 1; -#else - struct pci_dev *pdev = NULL; - struct pci_bus *pbus = NULL; - int retval; - sysfs_initialized = 1; - for_each_pci_dev(pdev) { - retval = pci_create_sysfs_dev_files(pdev); - if (retval) { - pci_dev_put(pdev); - return retval; - } - } -#endif while ((pbus = pci_find_next_bus(pbus))) pci_create_legacy_files(pbus);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index 4a14f88e543a..71a1fde1e505 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h@@ -393,16 +393,12 @@ static inline int pci_no_d1d2(struct pci_dev *dev) } #ifdef CONFIG_SYSFS -int pci_create_sysfs_dev_files(struct pci_dev *pdev); -void pci_remove_sysfs_dev_files(struct pci_dev *pdev); extern const struct attribute_group *pci_dev_groups[]; extern const struct attribute_group *pci_dev_attr_groups[]; extern const struct attribute_group *pcibus_groups[]; extern const struct attribute_group *pci_bus_groups[]; extern const struct attribute_group pci_doe_sysfs_group; #else -static inline int pci_create_sysfs_dev_files(struct pci_dev *pdev) { return 0; } -static inline void pci_remove_sysfs_dev_files(struct pci_dev *pdev) { } #define pci_dev_groups NULL #define pci_dev_attr_groups NULL #define pcibus_groups NULL
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index e9d519993853..6e796dbc5b29 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c@@ -26,7 +26,6 @@ static void pci_stop_dev(struct pci_dev *dev) device_release_driver(&dev->dev); pci_proc_detach_device(dev); - pci_remove_sysfs_dev_files(dev); of_pci_remove_node(dev); }
diff --git a/include/linux/pci.h b/include/linux/pci.h
index b998a56f6010..c56f2cf0d2ab 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h@@ -515,10 +515,6 @@ struct pci_dev { spinlock_t pcie_cap_lock; /* Protects RMW ops in capability accessors */ u32 saved_config_space[16]; /* Config space saved at suspend time */ struct hlist_head saved_cap_space; -#if !defined(HAVE_PCI_MMAP) && !defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) - struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */ - struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */ -#endif #ifdef CONFIG_HOTPLUG_PCI_PCIE unsigned int broken_cmd_compl:1; /* No compl for some cmds */
@@ -2533,11 +2529,6 @@ int pcibios_alloc_irq(struct pci_dev *dev); void pcibios_free_irq(struct pci_dev *dev); resource_size_t pcibios_default_alignment(void); -#if !defined(HAVE_PCI_MMAP) && !defined(ARCH_GENERIC_PCI_MMAP_RESOURCE) -extern int pci_create_resource_files(struct pci_dev *dev); -extern void pci_remove_resource_files(struct pci_dev *dev); -#endif - #if defined(CONFIG_PCI_MMCONFIG) || defined(CONFIG_ACPI_MCFG) void __init pci_mmcfg_early_init(void); void __init pci_mmcfg_late_init(void);
--
2.54.0