diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-15 12:38:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-15 12:38:53 -0800 |
| commit | 2d5a7101a140adcf7a5d8677649847fbb2dd5a2f (patch) | |
| tree | 02e3532964dd4c42aa6ea2187fee67e6dfee36dd /drivers/base/dd.c | |
| parent | 7f138b9706f5f3528d598aefd35337d54a8c1afb (diff) | |
| parent | c7334ce814f7e5d8fc1f9b3126cda0640c2f81b3 (diff) | |
| download | op-kernel-dev-2d5a7101a140adcf7a5d8677649847fbb2dd5a2f.zip op-kernel-dev-2d5a7101a140adcf7a5d8677649847fbb2dd5a2f.tar.gz | |
Merge tag 'driver-core-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fix from Greg KH:
"Here is a single patch being reverted to remove a feature that was
added in 4.10-rc1 that isn't quite ready for release.
It will be redone as a debugfs file instead of a sysfs file in the
future"
* tag 'driver-core-4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
Revert "driver core: Add deferred_probe attribute to devices in sysfs"
Diffstat (limited to 'drivers/base/dd.c')
| -rw-r--r-- | drivers/base/dd.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index a8b258e..a1fbf55 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c @@ -53,19 +53,6 @@ static LIST_HEAD(deferred_probe_pending_list); static LIST_HEAD(deferred_probe_active_list); static atomic_t deferred_trigger_count = ATOMIC_INIT(0); -static ssize_t deferred_probe_show(struct device *dev, - struct device_attribute *attr, char *buf) -{ - bool value; - - mutex_lock(&deferred_probe_mutex); - value = !list_empty(&dev->p->deferred_probe); - mutex_unlock(&deferred_probe_mutex); - - return sprintf(buf, "%d\n", value); -} -DEVICE_ATTR_RO(deferred_probe); - /* * In some cases, like suspend to RAM or hibernation, It might be reasonable * to prohibit probing of devices as it could be unsafe. |
