aboutsummaryrefslogtreecommitdiffstats
path: root/net-rfkill-convert-class-code-to-use-dev_groups.patch
diff options
Diffstat (limited to 'net-rfkill-convert-class-code-to-use-dev_groups.patch')
-rw-r--r--net-rfkill-convert-class-code-to-use-dev_groups.patch199
1 files changed, 0 insertions, 199 deletions
diff --git a/net-rfkill-convert-class-code-to-use-dev_groups.patch b/net-rfkill-convert-class-code-to-use-dev_groups.patch
deleted file mode 100644
index 71f66e171bacf6..00000000000000
--- a/net-rfkill-convert-class-code-to-use-dev_groups.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-From foo@baz Tue Jul 9 16:22:33 PDT 2013
-Date: Tue, 09 Jul 2013 16:22:33 -0700
-To: Greg KH <gregkh@linuxfoundation.org>
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Subject: net: rfkill: convert class code to use dev_groups
-
-The dev_attrs field of struct class is going away soon, dev_groups
-should be used instead. This converts the rfkill class code to use the
-correct field.
-
-Cc: Johannes Berg <johannes@sipsolutions.net>
-Cc: John W. Linville <linville@tuxdriver.com>
-Cc: linux-wireless@vger.kernel.org
-Cc: netdev@vger.kernel.org
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- net/rfkill/core.c | 88 ++++++++++++++++++++++++------------------------------
- 1 file changed, 40 insertions(+), 48 deletions(-)
-
---- a/net/rfkill/core.c
-+++ b/net/rfkill/core.c
-@@ -576,14 +576,14 @@ void rfkill_set_states(struct rfkill *rf
- }
- EXPORT_SYMBOL(rfkill_set_states);
-
--static ssize_t rfkill_name_show(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+static ssize_t name_show(struct device *dev, struct device_attribute *attr,
-+ char *buf)
- {
- struct rfkill *rfkill = to_rfkill(dev);
-
- return sprintf(buf, "%s\n", rfkill->name);
- }
-+static DEVICE_ATTR_RO(name);
-
- static const char *rfkill_get_type_str(enum rfkill_type type)
- {
-@@ -611,54 +611,52 @@ static const char *rfkill_get_type_str(e
- }
- }
-
--static ssize_t rfkill_type_show(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+static ssize_t type_show(struct device *dev, struct device_attribute *attr,
-+ char *buf)
- {
- struct rfkill *rfkill = to_rfkill(dev);
-
- return sprintf(buf, "%s\n", rfkill_get_type_str(rfkill->type));
- }
-+static DEVICE_ATTR_RO(type);
-
--static ssize_t rfkill_idx_show(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+static ssize_t index_show(struct device *dev, struct device_attribute *attr,
-+ char *buf)
- {
- struct rfkill *rfkill = to_rfkill(dev);
-
- return sprintf(buf, "%d\n", rfkill->idx);
- }
-+static DEVICE_ATTR_RO(index);
-
--static ssize_t rfkill_persistent_show(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+static ssize_t persistent_show(struct device *dev,
-+ struct device_attribute *attr, char *buf)
- {
- struct rfkill *rfkill = to_rfkill(dev);
-
- return sprintf(buf, "%d\n", rfkill->persistent);
- }
-+static DEVICE_ATTR_RO(persistent);
-
--static ssize_t rfkill_hard_show(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+static ssize_t hard_show(struct device *dev, struct device_attribute *attr,
-+ char *buf)
- {
- struct rfkill *rfkill = to_rfkill(dev);
-
- return sprintf(buf, "%d\n", (rfkill->state & RFKILL_BLOCK_HW) ? 1 : 0 );
- }
-+static DEVICE_ATTR_RO(hard);
-
--static ssize_t rfkill_soft_show(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+static ssize_t soft_show(struct device *dev, struct device_attribute *attr,
-+ char *buf)
- {
- struct rfkill *rfkill = to_rfkill(dev);
-
- return sprintf(buf, "%d\n", (rfkill->state & RFKILL_BLOCK_SW) ? 1 : 0 );
- }
-
--static ssize_t rfkill_soft_store(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf, size_t count)
-+static ssize_t soft_store(struct device *dev, struct device_attribute *attr,
-+ const char *buf, size_t count)
- {
- struct rfkill *rfkill = to_rfkill(dev);
- unsigned long state;
-@@ -680,6 +678,7 @@ static ssize_t rfkill_soft_store(struct
-
- return count;
- }
-+static DEVICE_ATTR_RW(soft);
-
- static u8 user_state_from_blocked(unsigned long state)
- {
-@@ -691,18 +690,16 @@ static u8 user_state_from_blocked(unsign
- return RFKILL_USER_STATE_UNBLOCKED;
- }
-
--static ssize_t rfkill_state_show(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+static ssize_t state_show(struct device *dev, struct device_attribute *attr,
-+ char *buf)
- {
- struct rfkill *rfkill = to_rfkill(dev);
-
- return sprintf(buf, "%d\n", user_state_from_blocked(rfkill->state));
- }
-
--static ssize_t rfkill_state_store(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf, size_t count)
-+static ssize_t state_store(struct device *dev, struct device_attribute *attr,
-+ const char *buf, size_t count)
- {
- struct rfkill *rfkill = to_rfkill(dev);
- unsigned long state;
-@@ -725,32 +722,27 @@ static ssize_t rfkill_state_store(struct
-
- return count;
- }
-+static DEVICE_ATTR_RW(state);
-
--static ssize_t rfkill_claim_show(struct device *dev,
-- struct device_attribute *attr,
-- char *buf)
-+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 ssize_t rfkill_claim_store(struct device *dev,
-- struct device_attribute *attr,
-- const char *buf, size_t count)
--{
-- return -EOPNOTSUPP;
--}
--
--static struct device_attribute rfkill_dev_attrs[] = {
-- __ATTR(name, S_IRUGO, rfkill_name_show, NULL),
-- __ATTR(type, S_IRUGO, rfkill_type_show, NULL),
-- __ATTR(index, S_IRUGO, rfkill_idx_show, NULL),
-- __ATTR(persistent, S_IRUGO, rfkill_persistent_show, NULL),
-- __ATTR(state, S_IRUGO|S_IWUSR, rfkill_state_show, rfkill_state_store),
-- __ATTR(claim, S_IRUGO|S_IWUSR, rfkill_claim_show, rfkill_claim_store),
-- __ATTR(soft, S_IRUGO|S_IWUSR, rfkill_soft_show, rfkill_soft_store),
-- __ATTR(hard, S_IRUGO, rfkill_hard_show, NULL),
-- __ATTR_NULL
-+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,
- };
-+ATTRIBUTE_GROUPS(rfkill_dev);
-
- static void rfkill_release(struct device *dev)
- {
-@@ -830,7 +822,7 @@ static int rfkill_resume(struct device *
- static struct class rfkill_class = {
- .name = "rfkill",
- .dev_release = rfkill_release,
-- .dev_attrs = rfkill_dev_attrs,
-+ .dev_groups = rfkill_dev_groups,
- .dev_uevent = rfkill_dev_uevent,
- .suspend = rfkill_suspend,
- .resume = rfkill_resume,
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:03:41 +0000