Commit 7f4708ab authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

net: ieee802154: 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 ieee802154 class code to use
the correct field.
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6be8aeef
...@@ -36,7 +36,8 @@ static ssize_t name ## _show(struct device *dev, \ ...@@ -36,7 +36,8 @@ static ssize_t name ## _show(struct device *dev, \
ret = snprintf(buf, PAGE_SIZE, format_string "\n", args); \ ret = snprintf(buf, PAGE_SIZE, format_string "\n", args); \
mutex_unlock(&phy->pib_lock); \ mutex_unlock(&phy->pib_lock); \
return ret; \ return ret; \
} } \
static DEVICE_ATTR_RO(name);
#define MASTER_SHOW(field, format_string) \ #define MASTER_SHOW(field, format_string) \
MASTER_SHOW_COMPLEX(field, format_string, phy->field) MASTER_SHOW_COMPLEX(field, format_string, phy->field)
...@@ -66,15 +67,17 @@ static ssize_t channels_supported_show(struct device *dev, ...@@ -66,15 +67,17 @@ static ssize_t channels_supported_show(struct device *dev,
mutex_unlock(&phy->pib_lock); mutex_unlock(&phy->pib_lock);
return len; return len;
} }
static DEVICE_ATTR_RO(channels_supported);
static struct device_attribute pmib_attrs[] = {
__ATTR_RO(current_channel), static struct attribute *pmib_attrs[] = {
__ATTR_RO(current_page), &dev_attr_current_channel.attr,
__ATTR_RO(channels_supported), &dev_attr_current_page.attr,
__ATTR_RO(transmit_power), &dev_attr_channels_supported.attr,
__ATTR_RO(cca_mode), &dev_attr_transmit_power.attr,
{}, &dev_attr_cca_mode.attr,
NULL,
}; };
ATTRIBUTE_GROUPS(pmib);
static void wpan_phy_release(struct device *d) static void wpan_phy_release(struct device *d)
{ {
...@@ -85,7 +88,7 @@ static void wpan_phy_release(struct device *d) ...@@ -85,7 +88,7 @@ static void wpan_phy_release(struct device *d)
static struct class wpan_phy_class = { static struct class wpan_phy_class = {
.name = "ieee802154", .name = "ieee802154",
.dev_release = wpan_phy_release, .dev_release = wpan_phy_release,
.dev_attrs = pmib_attrs, .dev_groups = pmib_groups,
}; };
static DEFINE_MUTEX(wpan_phy_mutex); static DEFINE_MUTEX(wpan_phy_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment