Commit bd641fd8 authored Mar 25, 2020 by Kelsey Skunberg Committed by Bjorn Helgaas Mar 30, 2020

PCI: sysfs: Revert "rescan" file renames

We changed these sysfs filenames:

  .../pci_bus/<domain:bus>/rescan  ->  .../pci_bus/<domain:bus>/bus_rescan
  .../<domain:bus:dev.fn>/rescan   ->  .../<domain:bus:dev.fn>/dev_rescan

and Ruslan reported [1] that this broke a userspace application.

Revert these name changes so both files are named "rescan" again.

Note that we have to use __ATTR() to assign custom C symbols, i.e.,
"struct device_attribute <symbol>".

[1] https://lore.kernel.org/r/CAB=otbSYozS-ZfxB0nCiNnxcbqxwrHOSYxJJtDKa63KzXbXgpw@mail.gmail.com

[bhelgaas: commit log, use __ATTR() both places so we don't have to rename
the attributes]
Fixes: 8bdfa145 ("PCI: sysfs: Define device attributes with DEVICE_ATTR*()")
Fixes: 4e2b7943 ("PCI: sysfs: Change DEVICE_ATTR() to DEVICE_ATTR_WO()")
Link: https://lore.kernel.org/r/20200325151708.32612-1-skunberg.kelsey@gmail.com


Signed-off-by: Kelsey Skunberg <kelsey.skunberg@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: stable@vger.kernel.org	# v5.4+

parent 2880325b

drivers/pci/pci-sysfs.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -464,7 +464,8 @@ static ssize_t dev_rescan_store(struct device *dev,
		}
		return count;
		}
		static DEVICE_ATTR_WO(dev_rescan);
		static struct device_attribute dev_attr_dev_rescan = __ATTR(rescan, 0200, NULL,
		dev_rescan_store);

		static ssize_t remove_store(struct device dev, struct device_attribute attr,
		const char *buf, size_t count)
		@@ -501,7 +502,8 @@ static ssize_t bus_rescan_store(struct device *dev,
		}
		return count;
		}
		static DEVICE_ATTR_WO(bus_rescan);
		static struct device_attribute dev_attr_bus_rescan = __ATTR(rescan, 0200, NULL,
		bus_rescan_store);

		#if defined(CONFIG_PM) && defined(CONFIG_ACPI)
		static ssize_t d3cold_allowed_store(struct device *dev,

Admin message