summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2014-11-09 08:36:47 +0100
committerMarcel Holtmann <marcel@holtmann.org>2014-11-09 19:50:28 +0100
commitf601379fa113906b8bf4389a62002def283519c9 (patch)
tree4c8a681b73693f4ad536db63fa64329cb9c44670
parent5fb3f026ae15827fe32e34adafce0d0f63ad0366 (diff)
ieee802154: rename wpan_phy_alloc
This patch renames the wpan_phy_alloc function to wpan_phy_new. This naming convention is like wireless and "wiphy_new" function. Signed-off-by: Alexander Aring <alex.aring@gmail.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
-rw-r--r--include/net/cfg802154.h2
-rw-r--r--net/ieee802154/core.c4
-rw-r--r--net/mac802154/main.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/include/net/cfg802154.h b/include/net/cfg802154.h
index ac8dd3b8669d..72c4723a1206 100644
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
@@ -88,7 +88,7 @@ struct wpan_dev {
#define to_phy(_dev) container_of(_dev, struct wpan_phy, dev)
struct wpan_phy *
-wpan_phy_alloc(const struct cfg802154_ops *ops, size_t priv_size);
+wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size);
static inline void wpan_phy_set_dev(struct wpan_phy *phy, struct device *dev)
{
phy->dev.parent = dev;
diff --git a/net/ieee802154/core.c b/net/ieee802154/core.c
index d1cd0edfb149..a3aa23f8c36c 100644
--- a/net/ieee802154/core.c
+++ b/net/ieee802154/core.c
@@ -70,7 +70,7 @@ int wpan_phy_for_each(int (*fn)(struct wpan_phy *phy, void *data),
EXPORT_SYMBOL(wpan_phy_for_each);
struct wpan_phy *
-wpan_phy_alloc(const struct cfg802154_ops *ops, size_t priv_size)
+wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size)
{
static atomic_t wpan_phy_counter = ATOMIC_INIT(0);
struct cfg802154_registered_device *rdev;
@@ -105,7 +105,7 @@ wpan_phy_alloc(const struct cfg802154_ops *ops, size_t priv_size)
return &rdev->wpan_phy;
}
-EXPORT_SYMBOL(wpan_phy_alloc);
+EXPORT_SYMBOL(wpan_phy_new);
int wpan_phy_register(struct wpan_phy *phy)
{
diff --git a/net/mac802154/main.c b/net/mac802154/main.c
index 7d0ff7fd2cd4..234084d26906 100644
--- a/net/mac802154/main.c
+++ b/net/mac802154/main.c
@@ -86,7 +86,7 @@ ieee802154_alloc_hw(size_t priv_data_len, const struct ieee802154_ops *ops)
priv_size = ALIGN(sizeof(*local), NETDEV_ALIGN) + priv_data_len;
- phy = wpan_phy_alloc(&mac802154_config_ops, priv_size);
+ phy = wpan_phy_new(&mac802154_config_ops, priv_size);
if (!phy) {
pr_err("failure to allocate master IEEE802.15.4 device\n");
return NULL;