| From d8e7d53a2fc14e0830ab728cb84ee19933d3ac8d Mon Sep 17 00:00:00 2001 |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Date: Thu, 30 Oct 2014 09:30:28 -0700 |
| Subject: PCI: Rename sysfs 'enabled' file back to 'enable' |
| |
| From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| commit d8e7d53a2fc14e0830ab728cb84ee19933d3ac8d upstream. |
| |
| 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> |
| |
| --- |
| drivers/pci/pci-sysfs.c | 8 ++++---- |
| 1 file changed, 4 insertions(+), 4 deletions(-) |
| |
| --- a/drivers/pci/pci-sysfs.c |
| +++ b/drivers/pci/pci-sysfs.c |
| @@ -185,7 +185,7 @@ static ssize_t modalias_show(struct devi |
| } |
| static DEVICE_ATTR_RO(modalias); |
| |
| -static ssize_t enabled_store(struct device *dev, struct device_attribute *attr, |
| +static ssize_t enable_store(struct device *dev, struct device_attribute *attr, |
| const char *buf, size_t count) |
| { |
| struct pci_dev *pdev = to_pci_dev(dev); |
| @@ -210,7 +210,7 @@ static ssize_t enabled_store(struct devi |
| return result < 0 ? result : count; |
| } |
| |
| -static ssize_t enabled_show(struct device *dev, struct device_attribute *attr, |
| +static ssize_t enable_show(struct device *dev, struct device_attribute *attr, |
| char *buf) |
| { |
| struct pci_dev *pdev; |
| @@ -218,7 +218,7 @@ static ssize_t enabled_show(struct devic |
| pdev = to_pci_dev(dev); |
| return sprintf(buf, "%u\n", atomic_read(&pdev->enable_cnt)); |
| } |
| -static DEVICE_ATTR_RW(enabled); |
| +static DEVICE_ATTR_RW(enable); |
| |
| #ifdef CONFIG_NUMA |
| static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr, |
| @@ -564,7 +564,7 @@ static struct attribute *pci_dev_attrs[] |
| #endif |
| &dev_attr_dma_mask_bits.attr, |
| &dev_attr_consistent_dma_mask_bits.attr, |
| - &dev_attr_enabled.attr, |
| + &dev_attr_enable.attr, |
| &dev_attr_broken_parity_status.attr, |
| &dev_attr_msi_bus.attr, |
| #if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI) |
