From patchwork Tue Jan 19 15:42:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= X-Patchwork-Id: 570020 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 14293140307 for ; Wed, 20 Jan 2016 02:46:33 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=tgmH9aof; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755454AbcASPp5 (ORCPT ); Tue, 19 Jan 2016 10:45:57 -0500 Received: from mail-qg0-f66.google.com ([209.85.192.66]:35460 "EHLO mail-qg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756261AbcASPoH (ORCPT ); Tue, 19 Jan 2016 10:44:07 -0500 Received: by mail-qg0-f66.google.com with SMTP id b35so57327141qge.2; Tue, 19 Jan 2016 07:44:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=HyrKBgssWIHnbNPqfSTD+RL43EL73PPHV0MbGqdEIHg=; b=tgmH9aofeQSGDwf8q8I3NXp7y3jTqBkY59QKiq3Qzl+gpJSa77TOgLPbUIvvfPyHWl qeSOpIAMfGuA4Z/VLim+/9qMvT6jVgVLhgzFMy4YHPZ6pL4ELKB8KNbFGJIMLaqbF/9S mFv8y8w+2+4nxrplu+JkWeJ8dlpAua1XUBejyBqsLo/3N6IbCLGkGY1wvJYA51g6mjN6 Kintw0Sxwb3mWcwU29vdOW3eydKl/Lqsdarrj7ffBQiN6QH0wEo6xrzm85ePTtXvY/QM 1o1PzyoN9+++k17qGVkT1hKSUuzIdPEHkk2/5M76JlAanW6TatlROjxBUO8fn68bSjk1 ia2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-type:content-transfer-encoding; bh=HyrKBgssWIHnbNPqfSTD+RL43EL73PPHV0MbGqdEIHg=; b=ArTcCC+/wJGbZ0+jWG3gJEdnnbWyG9zkRFV+VrvtG/xJTEAOJiF0OjUhk+5fNFt+GA 5YSXcM3erLh5Yt4XIfAM/Yi6QN+7QyC+OVCpLck72EsOd7yj9SCURV630sB92OPoBeV1 0fl8FkSSt59Jvp0UayBWRD2BAKoOFmF2zUbhNePtHcEjZQnNayX0pD39K0gFs40S7woO ygEbqSMpucZVx5Z3iVpi45o2d3yEXIUMsvcTqUwIWqhO8lywr5pm8iKTYNx5ljGC3FBg tt93Ac2pRcgfpbZp3z9nCujugZzME8wTENF5pEYLyOpWkL6mWAR+Wz0cvEwaQHNxJYD8 UVUQ== X-Gm-Message-State: ALoCoQm2EztK+8RaIbasM9F/mBF36z/aZDHEnpF7SBzF75gCpiYwKCQSJGT1Nxt/pdsuKtQ7z/NyACb1nHMTvNJXNbU7sM4+Gw== X-Received: by 10.140.91.66 with SMTP id y60mr38634458qgd.20.1453218246590; Tue, 19 Jan 2016 07:44:06 -0800 (PST) Received: from localhost.localdomain (c-98-239-150-235.hsd1.wv.comcast.net. [98.239.150.235]) by smtp.gmail.com with ESMTPSA id z10sm12336759qhz.5.2016.01.19.07.44.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 19 Jan 2016 07:44:06 -0800 (PST) From: "=?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?=" X-Google-Original-From: =?UTF-8?q?Jo=C3=A3o=20Paulo=20Rechi=20Vita?= To: johannes@sipsolutions.net Cc: marcel@holtmann.org, linux-wireless@vger.kernel.org, davem@davemloft.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, jprvita@endlessm.com, linux@endlessm.com Subject: [PATCH 4/8] rfkill: Remove obsolete "claim" sysfs interface Date: Tue, 19 Jan 2016 10:42:39 -0500 Message-Id: <1453218163-31998-5-git-send-email-jprvita@endlessm.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1453218163-31998-1-git-send-email-jprvita@endlessm.com> References: <1453218163-31998-1-git-send-email-jprvita@endlessm.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This was schedule to be removed in 2012 by: commit 69c86373c6ea1149aa559e6088362d58d8ec8835 Author: 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 Signed-off-by: John W. Linville Signed-off-by: João Paulo Rechi Vita --- Documentation/ABI/obsolete/sysfs-class-rfkill | 9 --------- Documentation/ABI/removed/sysfs-class-rfkill | 13 +++++++++++++ net/rfkill/core.c | 11 +---------- 3 files changed, 14 insertions(+), 19 deletions(-) create mode 100644 Documentation/ABI/removed/sysfs-class-rfkill diff --git a/Documentation/ABI/obsolete/sysfs-class-rfkill b/Documentation/ABI/obsolete/sysfs-class-rfkill index ff60ad9..e736d14 100644 --- a/Documentation/ABI/obsolete/sysfs-class-rfkill +++ b/Documentation/ABI/obsolete/sysfs-class-rfkill @@ -18,12 +18,3 @@ Values: A numeric value. 2: RFKILL_STATE_HARD_BLOCKED transmitter is forced off by something outside of the driver's control. - -What: /sys/class/rfkill/rfkill[0-9]+/claim -Date: 09-Jul-2007 -KernelVersion v2.6.22 -Contact: linux-wireless@vger.kernel.org -Description: This file is deprecated because there no longer is a way to - claim just control over a single rfkill instance. - This file is scheduled to be removed in 2012. -Values: 0: Kernel handles events diff --git a/Documentation/ABI/removed/sysfs-class-rfkill b/Documentation/ABI/removed/sysfs-class-rfkill new file mode 100644 index 0000000..3ce6231 --- /dev/null +++ b/Documentation/ABI/removed/sysfs-class-rfkill @@ -0,0 +1,13 @@ +rfkill - radio frequency (RF) connector kill switch support + +For details to this subsystem look at Documentation/rfkill.txt. + +What: /sys/class/rfkill/rfkill[0-9]+/claim +Date: 09-Jul-2007 +KernelVersion v2.6.22 +Contact: linux-wireless@vger.kernel.org +Description: This file was deprecated because there no longer was a way to + claim just control over a single rfkill instance. + This file was scheduled to be removed in 2012, and was removed + in 2016. +Values: 0: Kernel handles events diff --git a/net/rfkill/core.c b/net/rfkill/core.c index 5406c76..a05d1f1 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -309,8 +309,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. */ @@ -718,20 +717,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,