diff options
author | Alexander Aring <alex.aring@gmail.com> | 2014-11-09 02:36:47 -0500 |
---|---|---|
committer | Marcel Holtmann <marcel@holtmann.org> | 2014-11-09 13:50:28 -0500 |
commit | f601379fa113906b8bf4389a62002def283519c9 (patch) | |
tree | 4c8a681b73693f4ad536db63fa64329cb9c44670 /net | |
parent | 5fb3f026ae15827fe32e34adafce0d0f63ad0366 (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>
Diffstat (limited to 'net')
-rw-r--r-- | net/ieee802154/core.c | 4 | ||||
-rw-r--r-- | net/mac802154/main.c | 2 |
2 files changed, 3 insertions, 3 deletions
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), | |||
70 | EXPORT_SYMBOL(wpan_phy_for_each); | 70 | EXPORT_SYMBOL(wpan_phy_for_each); |
71 | 71 | ||
72 | struct wpan_phy * | 72 | struct wpan_phy * |
73 | wpan_phy_alloc(const struct cfg802154_ops *ops, size_t priv_size) | 73 | wpan_phy_new(const struct cfg802154_ops *ops, size_t priv_size) |
74 | { | 74 | { |
75 | static atomic_t wpan_phy_counter = ATOMIC_INIT(0); | 75 | static atomic_t wpan_phy_counter = ATOMIC_INIT(0); |
76 | struct cfg802154_registered_device *rdev; | 76 | struct cfg802154_registered_device *rdev; |
@@ -105,7 +105,7 @@ wpan_phy_alloc(const struct cfg802154_ops *ops, size_t priv_size) | |||
105 | 105 | ||
106 | return &rdev->wpan_phy; | 106 | return &rdev->wpan_phy; |
107 | } | 107 | } |
108 | EXPORT_SYMBOL(wpan_phy_alloc); | 108 | EXPORT_SYMBOL(wpan_phy_new); |
109 | 109 | ||
110 | int wpan_phy_register(struct wpan_phy *phy) | 110 | int wpan_phy_register(struct wpan_phy *phy) |
111 | { | 111 | { |
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) | |||
86 | 86 | ||
87 | priv_size = ALIGN(sizeof(*local), NETDEV_ALIGN) + priv_data_len; | 87 | priv_size = ALIGN(sizeof(*local), NETDEV_ALIGN) + priv_data_len; |
88 | 88 | ||
89 | phy = wpan_phy_alloc(&mac802154_config_ops, priv_size); | 89 | phy = wpan_phy_new(&mac802154_config_ops, priv_size); |
90 | if (!phy) { | 90 | if (!phy) { |
91 | pr_err("failure to allocate master IEEE802.15.4 device\n"); | 91 | pr_err("failure to allocate master IEEE802.15.4 device\n"); |
92 | return NULL; | 92 | return NULL; |