summaryrefslogtreecommitdiffstats
path: root/include/net/wireless.h
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2008-11-10 13:55:14 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-10 13:55:14 -0800
commitfb28ad35906af2f042c94e2f9c0f898ef9acfa37 (patch)
treeee3d535ab38d680b424a857406789f8c28bf5266 /include/net/wireless.h
parent23779897546c1effb546ff89b89803d9d955d517 (diff)
downloadblackbird-op-linux-fb28ad35906af2f042c94e2f9c0f898ef9acfa37.tar.gz
blackbird-op-linux-fb28ad35906af2f042c94e2f9c0f898ef9acfa37.zip
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.h4
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)
/**
* wiphy_name - get wiphy name
*/
-static inline char *wiphy_name(struct wiphy *wiphy)
+static inline const char *wiphy_name(struct wiphy *wiphy)
{
- return wiphy->dev.bus_id;
+ return dev_name(&wiphy->dev);
}
/**
OpenPOWER on IntegriCloud