diff options
author | Kay Sievers <kay.sievers@vrfy.org> | 2008-11-10 16:55:14 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-10 16:55:14 -0500 |
commit | fb28ad35906af2f042c94e2f9c0f898ef9acfa37 (patch) | |
tree | ee3d535ab38d680b424a857406789f8c28bf5266 /include/net/wireless.h | |
parent | 23779897546c1effb546ff89b89803d9d955d517 (diff) |
net: struct device - replace bus_id with dev_name(), dev_set_name()
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net/wireless.h')
-rw-r--r-- | include/net/wireless.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/wireless.h b/include/net/wireless.h index 17d4b582cf34..412351560b76 100644 --- a/include/net/wireless.h +++ b/include/net/wireless.h | |||
@@ -263,9 +263,9 @@ static inline struct device *wiphy_dev(struct wiphy *wiphy) | |||
263 | /** | 263 | /** |
264 | * wiphy_name - get wiphy name | 264 | * wiphy_name - get wiphy name |
265 | */ | 265 | */ |
266 | static inline char *wiphy_name(struct wiphy *wiphy) | 266 | static inline const char *wiphy_name(struct wiphy *wiphy) |
267 | { | 267 | { |
268 | return wiphy->dev.bus_id; | 268 | return dev_name(&wiphy->dev); |
269 | } | 269 | } |
270 | 270 | ||
271 | /** | 271 | /** |