Commit 4f6d4d1e authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

wireless: clean up sysfs code using %pM

Remove converting the MAC address to a string by a direct byte
conversion and use %pM instead, since the code is now boilerplate
use a macro to define the show functions, and also use the shorter
__ATTR_RO macro to define the attributes.
Signed-off-by: default avatarJohannes Berg <>
Signed-off-by: default avatarJohn W. Linville <>
parent 96dd603f
...@@ -23,25 +23,20 @@ static inline struct cfg80211_registered_device *dev_to_rdev( ...@@ -23,25 +23,20 @@ static inline struct cfg80211_registered_device *dev_to_rdev(
return container_of(dev, struct cfg80211_registered_device,; return container_of(dev, struct cfg80211_registered_device,;
} }
static ssize_t _show_index(struct device *dev, struct device_attribute *attr, #define SHOW_FMT(name, fmt, member) \
char *buf) static ssize_t name ## _show(struct device *dev, \
{ struct device_attribute *attr, \
return sprintf(buf, "%d\n", dev_to_rdev(dev)->idx); char *buf) \
{ \
return sprintf(buf, fmt "\n", dev_to_rdev(dev)->member); \
} }
static ssize_t _show_permaddr(struct device *dev, SHOW_FMT(index, "%d", idx);
struct device_attribute *attr, SHOW_FMT(macaddress, "%pM", wiphy.perm_addr);
char *buf)
unsigned char *addr = dev_to_rdev(dev)->wiphy.perm_addr;
return sprintf(buf, "%.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
addr[0], addr[1], addr[2], addr[3], addr[4], addr[5]);
static struct device_attribute ieee80211_dev_attrs[] = { static struct device_attribute ieee80211_dev_attrs[] = {
__ATTR(index, S_IRUGO, _show_index, NULL), __ATTR_RO(index),
__ATTR(macaddress, S_IRUGO, _show_permaddr, NULL), __ATTR_RO(macaddress),
{} {}
}; };
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment