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

Commit 8634c422 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "pci: use device_remove_file_self() instead of device_schedule_callback()" 



This reverts commit 6716d289.

Tejun writes:
        I'm sorry but can you please revert the whole series?
        get_active() waiting while a node is deactivated has potential
        to lead to deadlock and that deactivate/reactivate interface is
        something fundamentally flawed and that cgroup will have to work
        with the remove_self() like everybody else.  IOW, I think the
        first posting was correct.

Cc: Tejun Heo <tj@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c41d9663

drivers/pci/pci-sysfs.c

+18 −6
Original line number Diff line number Diff line
@@ -352,20 +352,32 @@ static struct device_attribute dev_rescan_attr = __ATTR(rescan, 
							(S_IWUSR|S_IWGRP),

							NULL, dev_rescan_store);



static void remove_callback(struct device *dev)

{

	struct pci_dev *pdev = to_pci_dev(dev);



	mutex_lock(&pci_remove_rescan_mutex);

	pci_stop_and_remove_bus_device(pdev);

	mutex_unlock(&pci_remove_rescan_mutex);

}



static ssize_t

remove_store(struct device *dev, struct device_attribute *attr,

remove_store(struct device *dev, struct device_attribute *dummy,

	     const char *buf, size_t count)

{

	int ret = 0;

	unsigned long val;



	if (kstrtoul(buf, 0, &val) < 0)

		return -EINVAL;



	if (val && device_remove_file_self(dev, attr)) {

		mutex_lock(&pci_remove_rescan_mutex);

		pci_stop_and_remove_bus_device(to_pci_dev(dev));

		mutex_unlock(&pci_remove_rescan_mutex);

	}

	/* An attribute cannot be unregistered by one of its own methods,

	 * so we have to use this roundabout approach.

	 */

	if (val)

		ret = device_schedule_callback(dev, remove_callback);

	if (ret)

		count = ret;

	return count;

}

static struct device_attribute dev_remove_attr = __ATTR(remove,