summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-13 14:05:13 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-01-13 14:05:13 -0800
commita9f138b0e537de55933335d580ebd38c2bc53c47 (patch)
treef54235f920d392519bde975d42aa4b4534f9561a /drivers/base
parent8634c422c1b7e50ca8e346f65afc140d93a3212c (diff)
downloadlinux-stable-a9f138b0e537de55933335d580ebd38c2bc53c47.tar.gz
linux-stable-a9f138b0e537de55933335d580ebd38c2bc53c47.tar.bz2
linux-stable-a9f138b0e537de55933335d580ebd38c2bc53c47.zip
Revert "kernfs, sysfs, driver-core: implement kernfs_remove_self() and its wrappers"
This reverts commit 1ae06819c77cff1ea2833c94f8c093fe8a5c79db. 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: Alan Stern <stern@rowland.harvard.edu> Cc: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/core.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/base/core.c b/drivers/base/core.c
index 9db57afcf81f..2b567177ef78 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -571,23 +571,6 @@ void device_remove_file(struct device *dev,
EXPORT_SYMBOL_GPL(device_remove_file);
/**
- * device_remove_file_self - remove sysfs attribute file from its own method.
- * @dev: device.
- * @attr: device attribute descriptor.
- *
- * See kernfs_remove_self() for details.
- */
-bool device_remove_file_self(struct device *dev,
- const struct device_attribute *attr)
-{
- if (dev)
- return sysfs_remove_file_self(&dev->kobj, &attr->attr);
- else
- return false;
-}
-EXPORT_SYMBOL_GPL(device_remove_file_self);
-
-/**
* device_create_bin_file - create sysfs binary attribute file for device.
* @dev: device.
* @attr: device binary attribute descriptor.