1 files changed, 2 insertions, 285 deletions
diff --git a/d2.patch b/d2.patch
index e7fb43fd6edcba..bd29f82eb8e2cd 100644
--- a/d2.patch
+++ b/d2.patch
@@ -1,9 +1,6 @@
 ---
- net/core/net-sysfs.c        |  134 ++++++++++++++++++++++++--------------------
- net/ieee802154/wpan-class.c |   21 +++---
- net/rfkill/core.c           |   88 +++++++++++++---------------
- net/wireless/sysfs.c        |   23 ++++---
- 4 files changed, 139 insertions(+), 127 deletions(-)
+ net/core/net-sysfs.c |  134 ++++++++++++++++++++++++++++-----------------------
+ 1 file changed, 74 insertions(+), 60 deletions(-)
 
 --- a/net/core/net-sysfs.c
 +++ b/net/core/net-sysfs.c
@@ -320,283 +317,3 @@
  	.dev_uevent = netdev_uevent,
  	.ns_type = &net_ns_type_operations,
  	.namespace = net_namespace,
---- a/net/ieee802154/wpan-class.c
-+++ b/net/ieee802154/wpan-class.c
-@@ -36,7 +36,8 @@ static ssize_t name ## _show(struct devi
- 	ret = snprintf(buf, PAGE_SIZE, format_string "\n", args);	\
- 	mutex_unlock(&phy->pib_lock);					\
- 	return ret;							\
--}
-+}									\
-+static DEVICE_ATTR_RO(name);
- 
- #define MASTER_SHOW(field, format_string)				\
- 	MASTER_SHOW_COMPLEX(field, format_string, phy->field)
-@@ -66,15 +67,17 @@ static ssize_t channels_supported_show(s
- 	mutex_unlock(&phy->pib_lock);
- 	return len;
- }
-+static DEVICE_ATTR_RO(channels_supported);
- 
--static struct device_attribute pmib_attrs[] = {
--	__ATTR_RO(current_channel),
--	__ATTR_RO(current_page),
--	__ATTR_RO(channels_supported),
--	__ATTR_RO(transmit_power),
--	__ATTR_RO(cca_mode),
--	{},
-+static struct attribute *pmib_attrs[] = {
-+	&dev_attr_current_channel.attr,
-+	&dev_attr_current_page.attr,
-+	&dev_attr_channels_supported.attr,
-+	&dev_attr_transmit_power.attr,
-+	&dev_attr_cca_mode.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(pmib);
- 
- static void wpan_phy_release(struct device *d)
- {
-@@ -85,7 +88,7 @@ static void wpan_phy_release(struct devi
- static struct class wpan_phy_class = {
- 	.name = "ieee802154",
- 	.dev_release = wpan_phy_release,
--	.dev_attrs = pmib_attrs,
-+	.dev_groups = pmib_groups,
- };
- 
- static DEFINE_MUTEX(wpan_phy_mutex);
---- 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,
---- a/net/wireless/sysfs.c
-+++ b/net/wireless/sysfs.c
-@@ -30,7 +30,8 @@ static ssize_t name ## _show(struct devi
- 			      char *buf)				\
- {									\
- 	return sprintf(buf, fmt "\n", dev_to_rdev(dev)->member);	\
--}
-+}									\
-+static DEVICE_ATTR_RO(name)
- 
- SHOW_FMT(index, "%d", wiphy_idx);
- SHOW_FMT(macaddress, "%pM", wiphy.perm_addr);
-@@ -42,7 +43,7 @@ static ssize_t name_show(struct device *
- 	struct wiphy *wiphy = &dev_to_rdev(dev)->wiphy;
- 	return sprintf(buf, "%s\n", dev_name(&wiphy->dev));
- }
--
-+static DEVICE_ATTR_RO(name);
- 
- static ssize_t addresses_show(struct device *dev,
- 			      struct device_attribute *attr,
-@@ -60,15 +61,17 @@ static ssize_t addresses_show(struct dev
- 
- 	return buf - start;
- }
-+static DEVICE_ATTR_RO(addresses);
- 
--static struct device_attribute ieee80211_dev_attrs[] = {
--	__ATTR_RO(index),
--	__ATTR_RO(macaddress),
--	__ATTR_RO(address_mask),
--	__ATTR_RO(addresses),
--	__ATTR_RO(name),
--	{}
-+static struct attribute *ieee80211_attrs[] = {
-+	&dev_attr_index.attr,
-+	&dev_attr_macaddress.attr,
-+	&dev_attr_address_mask.attr,
-+	&dev_attr_addresses.attr,
-+	&dev_attr_name.attr,
-+	NULL,
- };
-+ATTRIBUTE_GROUPS(ieee80211);
- 
- static void wiphy_dev_release(struct device *dev)
- {
-@@ -144,7 +147,7 @@ struct class ieee80211_class = {
- 	.name = "ieee80211",
- 	.owner = THIS_MODULE,
- 	.dev_release = wiphy_dev_release,
--	.dev_attrs = ieee80211_dev_attrs,
-+	.dev_groups = ieee80211_groups,
- 	.dev_uevent = wiphy_uevent,
- 	.suspend = wiphy_suspend,
- 	.resume = wiphy_resume,