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: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
96dd603f38
commit
4f6d4d1e36
|
@ -23,25 +23,20 @@ static inline struct cfg80211_registered_device *dev_to_rdev(
|
|||
return container_of(dev, struct cfg80211_registered_device, wiphy.dev);
|
||||
}
|
||||
|
||||
static ssize_t _show_index(struct device *dev, struct device_attribute *attr,
|
||||
char *buf)
|
||||
{
|
||||
return sprintf(buf, "%d\n", dev_to_rdev(dev)->idx);
|
||||
#define SHOW_FMT(name, fmt, member) \
|
||||
static ssize_t name ## _show(struct device *dev, \
|
||||
struct device_attribute *attr, \
|
||||
char *buf) \
|
||||
{ \
|
||||
return sprintf(buf, fmt "\n", dev_to_rdev(dev)->member); \
|
||||
}
|
||||
|
||||
static ssize_t _show_permaddr(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
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]);
|
||||
}
|
||||
SHOW_FMT(index, "%d", idx);
|
||||
SHOW_FMT(macaddress, "%pM", wiphy.perm_addr);
|
||||
|
||||
static struct device_attribute ieee80211_dev_attrs[] = {
|
||||
__ATTR(index, S_IRUGO, _show_index, NULL),
|
||||
__ATTR(macaddress, S_IRUGO, _show_permaddr, NULL),
|
||||
__ATTR_RO(index),
|
||||
__ATTR_RO(macaddress),
|
||||
{}
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue