Skip to content

Commit

Permalink
wpan-phy: follow usual patter of devices registration
Browse files Browse the repository at this point in the history
Follow the usual pattern of devices registration by adding new function
(wpan_phy_set_dev) that sets child->parent relationship and removing
parent argument from wpan_phy_register call.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  • Loading branch information
Dmitry Eremin-Solenikov committed Nov 6, 2009
1 parent a0b4a73 commit e9cf356
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
3 changes: 2 additions & 1 deletion drivers/ieee802154/fakehard.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 5 additions & 1 deletion include/net/wpan-phy.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 1 addition & 3 deletions net/ieee802154/wpan-class.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit e9cf356

Please sign in to comment.