diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-10-30 12:30:28 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-10-30 13:17:10 -0400 |
| commit | d8e7d53a2fc14e0830ab728cb84ee19933d3ac8d (patch) | |
| tree | a62a3b4bbf1ff8a58bb6af4233a1b09870877b8d | |
| parent | a2fa6f64c26aa0ea75b15116dd4a4f89bb5c869e (diff) | |
PCI: Rename sysfs 'enabled' file back to 'enable'
Back in commit 5136b2da770d ("PCI: convert bus code to use dev_groups"),
I misstyped the 'enable' sysfs filename as 'enabled', which broke the
userspace API. This patch fixes that issue by renaming the file back.
Fixes: 5136b2da770d ("PCI: convert bus code to use dev_groups")
Reported-by: Jeff Epler <jepler@unpythonic.net>
Tested-by: Jeff Epler <jepler@unpythonic.net> # on v3.14-rt
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org # 3.13
| -rw-r--r-- | drivers/pci/pci-sysfs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 92b6d9ab00e4..2c6643fdc0cf 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c | |||
| @@ -185,7 +185,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, | |||
| 185 | } | 185 | } |
| 186 | static DEVICE_ATTR_RO(modalias); | 186 | static DEVICE_ATTR_RO(modalias); |
| 187 | 187 | ||
| 188 | static ssize_t enabled_store(struct device *dev, struct device_attribute *attr, | 188 | static ssize_t enable_store(struct device *dev, struct device_attribute *attr, |
| 189 | const char *buf, size_t count) | 189 | const char *buf, size_t count) |
| 190 | { | 190 | { |
| 191 | struct pci_dev *pdev = to_pci_dev(dev); | 191 | struct pci_dev *pdev = to_pci_dev(dev); |
| @@ -210,7 +210,7 @@ static ssize_t enabled_store(struct device *dev, struct device_attribute *attr, | |||
| 210 | return result < 0 ? result : count; | 210 | return result < 0 ? result : count; |
| 211 | } | 211 | } |
| 212 | 212 | ||
| 213 | static ssize_t enabled_show(struct device *dev, struct device_attribute *attr, | 213 | static ssize_t enable_show(struct device *dev, struct device_attribute *attr, |
| 214 | char *buf) | 214 | char *buf) |
| 215 | { | 215 | { |
| 216 | struct pci_dev *pdev; | 216 | struct pci_dev *pdev; |
| @@ -218,7 +218,7 @@ static ssize_t enabled_show(struct device *dev, struct device_attribute *attr, | |||
| 218 | pdev = to_pci_dev(dev); | 218 | pdev = to_pci_dev(dev); |
| 219 | return sprintf(buf, "%u\n", atomic_read(&pdev->enable_cnt)); | 219 | return sprintf(buf, "%u\n", atomic_read(&pdev->enable_cnt)); |
| 220 | } | 220 | } |
| 221 | static DEVICE_ATTR_RW(enabled); | 221 | static DEVICE_ATTR_RW(enable); |
| 222 | 222 | ||
| 223 | #ifdef CONFIG_NUMA | 223 | #ifdef CONFIG_NUMA |
| 224 | static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr, | 224 | static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr, |
| @@ -563,7 +563,7 @@ static struct attribute *pci_dev_attrs[] = { | |||
| 563 | #endif | 563 | #endif |
| 564 | &dev_attr_dma_mask_bits.attr, | 564 | &dev_attr_dma_mask_bits.attr, |
| 565 | &dev_attr_consistent_dma_mask_bits.attr, | 565 | &dev_attr_consistent_dma_mask_bits.attr, |
| 566 | &dev_attr_enabled.attr, | 566 | &dev_attr_enable.attr, |
| 567 | &dev_attr_broken_parity_status.attr, | 567 | &dev_attr_broken_parity_status.attr, |
| 568 | &dev_attr_msi_bus.attr, | 568 | &dev_attr_msi_bus.attr, |
| 569 | #if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI) | 569 | #if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI) |
