Merge commit 'v3.17' into next

1 files changed, 7 insertions, 3 deletions

diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c
index 8d6f6704da84..4955e0fe5883 100644
--- a/net/ieee802154/wpan-class.c
+++ b/net/ieee802154/wpan-class.c
@@ -48,7 +48,8 @@ MASTER_SHOW(transmit_power, "%d +- 1 dB");
 MASTER_SHOW(cca_mode, "%d");
 
 static ssize_t channels_supported_show(struct device *dev,
-                            struct device_attribute *attr, char *buf)
+                                       struct device_attribute *attr,
+                                       char *buf)
 {
         struct wpan_phy *phy = container_of(dev, struct wpan_phy, dev);
         int ret;
@@ -57,7 +58,7 @@ static ssize_t channels_supported_show(struct device *dev,
         mutex_lock(&phy->pib_lock);
         for (i = 0; i < 32; i++) {
                 ret = snprintf(buf + len, PAGE_SIZE - len,
-                                "%#09x\n", phy->channels_supported[i]);
+                               "%#09x\n", phy->channels_supported[i]);
                 if (ret < 0)
                         break;
                 len += ret;
@@ -80,6 +81,7 @@ ATTRIBUTE_GROUPS(pmib);
 static void wpan_phy_release(struct device *d)
 {
         struct wpan_phy *phy = container_of(d, struct wpan_phy, dev);
+
         kfree(phy);
 }
 
@@ -121,11 +123,12 @@ static int wpan_phy_iter(struct device *dev, void *_data)
 {
         struct wpan_phy_iter_data *wpid = _data;
         struct wpan_phy *phy = container_of(dev, struct wpan_phy, dev);
+
         return wpid->fn(phy, wpid->data);
 }
 
 int wpan_phy_for_each(int (*fn)(struct wpan_phy *phy, void *data),
-                void *data)
+                      void *data)
 {
         struct wpan_phy_iter_data wpid = {
                 .fn = fn,
@@ -197,6 +200,7 @@ EXPORT_SYMBOL(wpan_phy_free);
 static int __init wpan_phy_class_init(void)
 {
         int rc;
+
         rc = class_register(&wpan_phy_class);
         if (rc)
                 goto err;