aboutsummaryrefslogtreecommitdiffstats
path: root/net/rfkill
diff options
context:
space:
mode:
authorJoão Paulo Rechi Vita <jprvita@gmail.com>2016-01-19 10:42:39 -0500
committerJohannes Berg <johannes.berg@intel.com>2016-02-24 09:04:24 +0100
commite2a35e89291d70d1c4668b3216f84ec740d36be3 (patch)
treed4663fabd60a4460f3361546044dcd641743ca36 /net/rfkill
parentrfkill: remove/inline __rfkill_set_hw_state (diff)
downloadlinux-dev-e2a35e89291d70d1c4668b3216f84ec740d36be3.tar.xz
linux-dev-e2a35e89291d70d1c4668b3216f84ec740d36be3.zip
rfkill: Remove obsolete "claim" sysfs interface
This was scheduled to be removed in 2012 by: commit 69c86373c6ea1149aa559e6088362d58d8ec8835 Author: florian@mickler.org <florian@mickler.org> Date: Wed Feb 24 12:05:16 2010 +0100 Document the rfkill sysfs ABI This moves sysfs ABI info from Documentation/rfkill.txt to the ABI subfolder and reformats it. This also schedules the deprecated sysfs parts to be removed in 2012 (claim file) and 2014 (state file). Signed-off-by: Florian Mickler <florian@mickler.org> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: João Paulo Rechi Vita <jprvita@endlessm.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/rfkill')
-rw-r--r--net/rfkill/core.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/net/rfkill/core.c b/net/rfkill/core.c
index 076590e92dde..a805831d5d9b 100644
--- a/net/rfkill/core.c
+++ b/net/rfkill/core.c
@@ -311,8 +311,7 @@ static atomic_t rfkill_input_disabled = ATOMIC_INIT(0);
* @blocked: the new state
*
* This function sets the state of all switches of given type,
- * unless a specific switch is claimed by userspace (in which case,
- * that switch is left alone) or suspended.
+ * unless a specific switch is suspended.
*
* Caller must have acquired rfkill_global_mutex.
*/
@@ -721,20 +720,12 @@ static ssize_t state_store(struct device *dev, struct device_attribute *attr,
}
static DEVICE_ATTR_RW(state);
-static ssize_t claim_show(struct device *dev, struct device_attribute *attr,
- char *buf)
-{
- return sprintf(buf, "%d\n", 0);
-}
-static DEVICE_ATTR_RO(claim);
-
static struct attribute *rfkill_dev_attrs[] = {
&dev_attr_name.attr,
&dev_attr_type.attr,
&dev_attr_index.attr,
&dev_attr_persistent.attr,
&dev_attr_state.attr,
- &dev_attr_claim.attr,
&dev_attr_soft.attr,
&dev_attr_hard.attr,
NULL,