Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8e7d53a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Bjorn Helgaas
Browse files

PCI: Rename sysfs 'enabled' file back to 'enable' 



Back in commit 5136b2da ("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: 5136b2da ("PCI: convert bus code to use dev_groups")
Reported-by: default avatarJeff Epler <jepler@unpythonic.net>
Tested-by: Jeff Epler <jepler@unpythonic.net>	# on v3.14-rt
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org	# 3.13
parent a2fa6f64

drivers/pci/pci-sysfs.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -185,7 +185,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, 
}

}

static DEVICE_ATTR_RO(modalias);

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)

			     const char *buf, size_t count)

{

{

	struct pci_dev *pdev = to_pci_dev(dev);

	struct pci_dev *pdev = to_pci_dev(dev);
@@ -210,7 +210,7 @@ static ssize_t enabled_store(struct device *dev, struct device_attribute *attr, 
	return result < 0 ? result : count;

	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)

			    char *buf)

{

{

	struct pci_dev *pdev;

	struct pci_dev *pdev;
@@ -218,7 +218,7 @@ static ssize_t enabled_show(struct device *dev, struct device_attribute *attr, 
	pdev = to_pci_dev(dev);

	pdev = to_pci_dev(dev);

	return sprintf(buf, "%u\n", atomic_read(&pdev->enable_cnt));

	return sprintf(buf, "%u\n", atomic_read(&pdev->enable_cnt));

}

}

static DEVICE_ATTR_RW(enabled);

static DEVICE_ATTR_RW(enable);





#ifdef CONFIG_NUMA

#ifdef CONFIG_NUMA

static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr,

static ssize_t numa_node_show(struct device *dev, struct device_attribute *attr,
@@ -563,7 +563,7 @@ static struct attribute *pci_dev_attrs[] = { 
#endif

#endif

	&dev_attr_dma_mask_bits.attr,

	&dev_attr_dma_mask_bits.attr,

	&dev_attr_consistent_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_broken_parity_status.attr,

	&dev_attr_msi_bus.attr,

	&dev_attr_msi_bus.attr,

#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)

#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)