@@ -1010,26 +1010,6 @@ static const struct attribute_group pcie_dev_attr_group = {
/*
* PCI Bus Class Devices
*/
-static ssize_t cpuaffinity_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct pci_bus *bus = to_pci_bus(dev);
- const struct cpumask *cpumask = cpumask_of_pcibus(bus);
-
- return cpumap_print_to_pagebuf(false, buf, cpumask);
-}
-static DEVICE_ATTR_RO(cpuaffinity);
-
-static ssize_t cpulistaffinity_show(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct pci_bus *bus = to_pci_bus(dev);
- const struct cpumask *cpumask = cpumask_of_pcibus(bus);
-
- return cpumap_print_to_pagebuf(true, buf, cpumask);
-}
-static DEVICE_ATTR_RO(cpulistaffinity);
-
static ssize_t rescan_store(struct bus_type *bus, const char *buf, size_t count)
{
bool rescan;
@@ -1058,10 +1038,25 @@ static const struct attribute_group pci_bus_group = {
.attrs = pci_bus_attrs,
};
-const struct attribute_group *pci_bus_groups[] = {
- &pci_bus_group,
- NULL,
-};
+static ssize_t cpuaffinity_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct pci_bus *bus = to_pci_bus(dev);
+ const struct cpumask *cpumask = cpumask_of_pcibus(bus);
+
+ return cpumap_print_to_pagebuf(false, buf, cpumask);
+}
+static DEVICE_ATTR_RO(cpuaffinity);
+
+static ssize_t cpulistaffinity_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ struct pci_bus *bus = to_pci_bus(dev);
+ const struct cpumask *cpumask = cpumask_of_pcibus(bus);
+
+ return cpumap_print_to_pagebuf(true, buf, cpumask);
+}
+static DEVICE_ATTR_RO(cpulistaffinity);
static ssize_t bus_rescan_store(struct device *dev,
struct device_attribute *attr, const char *buf,
@@ -1603,6 +1598,11 @@ static const struct attribute_group *pci_dev_attr_groups[] = {
NULL,
};
+const struct attribute_group *pci_bus_groups[] = {
+ &pci_bus_group,
+ NULL,
+};
+
const struct device_type pci_dev_type = {
.groups = pci_dev_attr_groups,
};
When new sysfs objects were added to the PCI device over time, the code that implemented new attributes has been added in many different places in the pci-sysfs.c file. This makes it hard to read and also hard to find relevant code. Thus, collect all the attributes that are part of the "pci_bus_group" attribute group together and move to the top of the file sorting everything attribute in the order of use. No functional change intended. Suggested-by: Bjorn Helgaas <bhelgaas@google.com> Signed-off-by: Krzysztof Wilczyński <kw@linux.com> --- drivers/pci/pci-sysfs.c | 48 ++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-)