diff options
Diffstat (limited to 'drivers/pci/pci-sysfs.c')
-rw-r--r-- | drivers/pci/pci-sysfs.c | 32 |
1 files changed, 21 insertions, 11 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index c0dbe1f61362..7128cfdd64aa 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
@@ -131,19 +131,19 @@ static ssize_t pci_bus_show_cpuaffinity(struct device *dev, | |||
131 | return ret; | 131 | return ret; |
132 | } | 132 | } |
133 | 133 | ||
134 | static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev, | 134 | static ssize_t cpuaffinity_show(struct device *dev, |
135 | struct device_attribute *attr, | 135 | struct device_attribute *attr, char *buf) |
136 | char *buf) | ||
137 | { | 136 | { |
138 | return pci_bus_show_cpuaffinity(dev, 0, attr, buf); | 137 | return pci_bus_show_cpuaffinity(dev, 0, attr, buf); |
139 | } | 138 | } |
139 | static DEVICE_ATTR_RO(cpuaffinity); | ||
140 | 140 | ||
141 | static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev, | 141 | static ssize_t cpulistaffinity_show(struct device *dev, |
142 | struct device_attribute *attr, | 142 | struct device_attribute *attr, char *buf) |
143 | char *buf) | ||
144 | { | 143 | { |
145 | return pci_bus_show_cpuaffinity(dev, 1, attr, buf); | 144 | return pci_bus_show_cpuaffinity(dev, 1, attr, buf); |
146 | } | 145 | } |
146 | static DEVICE_ATTR_RO(cpulistaffinity); | ||
147 | 147 | ||
148 | /* show resources */ | 148 | /* show resources */ |
149 | static ssize_t | 149 | static ssize_t |
@@ -379,6 +379,7 @@ dev_bus_rescan_store(struct device *dev, struct device_attribute *attr, | |||
379 | } | 379 | } |
380 | return count; | 380 | return count; |
381 | } | 381 | } |
382 | static DEVICE_ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_bus_rescan_store); | ||
382 | 383 | ||
383 | #if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI) | 384 | #if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI) |
384 | static ssize_t d3cold_allowed_store(struct device *dev, | 385 | static ssize_t d3cold_allowed_store(struct device *dev, |
@@ -514,11 +515,20 @@ struct device_attribute pci_dev_attrs[] = { | |||
514 | __ATTR_NULL, | 515 | __ATTR_NULL, |
515 | }; | 516 | }; |
516 | 517 | ||
517 | struct device_attribute pcibus_dev_attrs[] = { | 518 | static struct attribute *pcibus_attrs[] = { |
518 | __ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_bus_rescan_store), | 519 | &dev_attr_rescan.attr, |
519 | __ATTR(cpuaffinity, S_IRUGO, pci_bus_show_cpumaskaffinity, NULL), | 520 | &dev_attr_cpuaffinity.attr, |
520 | __ATTR(cpulistaffinity, S_IRUGO, pci_bus_show_cpulistaffinity, NULL), | 521 | &dev_attr_cpulistaffinity.attr, |
521 | __ATTR_NULL, | 522 | NULL, |
523 | }; | ||
524 | |||
525 | static const struct attribute_group pcibus_group = { | ||
526 | .attrs = pcibus_attrs, | ||
527 | }; | ||
528 | |||
529 | const struct attribute_group *pcibus_groups[] = { | ||
530 | &pcibus_group, | ||
531 | NULL, | ||
522 | }; | 532 | }; |
523 | 533 | ||
524 | static ssize_t | 534 | static ssize_t |