3 files changed, 8 insertions, 5 deletions

diff --git a/drivers/ieee802154/fakehard.c b/drivers/ieee802154/fakehard.c
index f6f2afefaa17..4ea93cc7afcc 100644
--- a/drivers/ieee802154/fakehard.c
+++ b/drivers/ieee802154/fakehard.c
@@ -372,11 +372,12 @@ static int __devinit ieee802154fake_probe(struct platform_device *pdev)
                         goto out;
         }
 
+        wpan_phy_set_dev(phy, &pdev->dev);
         SET_NETDEV_DEV(dev, &phy->dev);
 
         platform_set_drvdata(pdev, dev);
 
-        err = wpan_phy_register(&pdev->dev, phy);
+        err = wpan_phy_register(phy);
         if (err)
                 goto out;
 
diff --git a/include/net/wpan-phy.h b/include/net/wpan-phy.h
index 7b7fc581e673..f63537c17363 100644
--- a/include/net/wpan-phy.h
+++ b/include/net/wpan-phy.h
@@ -45,7 +45,11 @@ struct wpan_phy {
 };
 
 struct wpan_phy *wpan_phy_alloc(size_t priv_size);
-int wpan_phy_register(struct device *parent, struct wpan_phy *phy);
+static inline void wpan_phy_set_dev(struct wpan_phy *phy, struct device *dev)
+{
+        phy->dev.parent = dev;
+}
+int wpan_phy_register(struct wpan_phy *phy);
 void wpan_phy_unregister(struct wpan_phy *phy);
 void wpan_phy_free(struct wpan_phy *phy);
 /* Same semantics as for class_for_each_device */
diff --git a/net/ieee802154/wpan-class.c b/net/ieee802154/wpan-class.c
index 0c51f85aa591..cd42e88b8397 100644
--- a/net/ieee802154/wpan-class.c
+++ b/net/ieee802154/wpan-class.c
@@ -168,10 +168,8 @@ struct wpan_phy *wpan_phy_alloc(size_t priv_size)
 }
 EXPORT_SYMBOL(wpan_phy_alloc);
 
-int wpan_phy_register(struct device *parent, struct wpan_phy *phy)
+int wpan_phy_register(struct wpan_phy *phy)
 {
-        phy->dev.parent = parent;
-
         return device_add(&phy->dev);
 }
 EXPORT_SYMBOL(wpan_phy_register);