lkml.org 
[lkml]   [2013]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 31/36] net: ieee802154: convert class code to use dev_groups
    Date
    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.

    Cc: Alexander Smirnov <alex.bluesman.smirnov@gmail.com>
    Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
    Cc: netdev@vger.kernel.org
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---

    netdev@ maintainers, feel free to take this through your tree, or ACK it
    and I can take it through mine.

    net/ieee802154/wpan-class.c | 23 +++++++++++++----------
    1 file changed, 13 insertions(+), 10 deletions(-)

    diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c
    index 13571eae..ef56ab5b 100644
    --- a/net/ieee802154/wpan-class.c
    +++ b/net/ieee802154/wpan-class.c
    @@ -36,7 +36,8 @@ static ssize_t name ## _show(struct device *dev, \
    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(struct device *dev,
    mutex_unlock(&phy->pib_lock);
    return len;
    }
    -
    -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 DEVICE_ATTR_RO(channels_supported);
    +
    +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 device *d)
    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);
    --
    1.8.3.rc0.20.gb99dd2e


    \
     
     \ /
      Last update: 2013-07-25 02:01    [W:2.857 / U:1.096 seconds]
    ©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site