|
@@ -48,49 +48,6 @@ static ssize_t name_show(struct device *dev,
|
|
|
}
|
|
|
static DEVICE_ATTR_RO(name);
|
|
|
|
|
|
-#define MASTER_SHOW_COMPLEX(name, format_string, args...) \
|
|
|
-static ssize_t name ## _show(struct device *dev, \
|
|
|
- struct device_attribute *attr, char *buf) \
|
|
|
-{ \
|
|
|
- struct wpan_phy *phy = container_of(dev, struct wpan_phy, dev); \
|
|
|
- int ret; \
|
|
|
- \
|
|
|
- mutex_lock(&phy->pib_lock); \
|
|
|
- ret = snprintf(buf, PAGE_SIZE, format_string "\n", args); \
|
|
|
- mutex_unlock(&phy->pib_lock); \
|
|
|
- return ret; \
|
|
|
-} \
|
|
|
-static DEVICE_ATTR_RO(name)
|
|
|
-
|
|
|
-#define MASTER_SHOW(field, format_string) \
|
|
|
- MASTER_SHOW_COMPLEX(field, format_string, phy->field)
|
|
|
-
|
|
|
-MASTER_SHOW(current_channel, "%d");
|
|
|
-MASTER_SHOW(current_page, "%d");
|
|
|
-MASTER_SHOW(transmit_power, "%d +- 1 dB");
|
|
|
-MASTER_SHOW_COMPLEX(cca_mode, "%d", phy->cca.mode);
|
|
|
-
|
|
|
-static ssize_t channels_supported_show(struct device *dev,
|
|
|
- struct device_attribute *attr,
|
|
|
- char *buf)
|
|
|
-{
|
|
|
- struct wpan_phy *phy = container_of(dev, struct wpan_phy, dev);
|
|
|
- int ret;
|
|
|
- int i, len = 0;
|
|
|
-
|
|
|
- mutex_lock(&phy->pib_lock);
|
|
|
- for (i = 0; i < 32; i++) {
|
|
|
- ret = snprintf(buf + len, PAGE_SIZE - len,
|
|
|
- "%#09x\n", phy->channels_supported[i]);
|
|
|
- if (ret < 0)
|
|
|
- break;
|
|
|
- len += ret;
|
|
|
- }
|
|
|
- mutex_unlock(&phy->pib_lock);
|
|
|
- return len;
|
|
|
-}
|
|
|
-static DEVICE_ATTR_RO(channels_supported);
|
|
|
-
|
|
|
static void wpan_phy_release(struct device *dev)
|
|
|
{
|
|
|
struct cfg802154_registered_device *rdev = dev_to_rdev(dev);
|
|
@@ -101,12 +58,6 @@ static void wpan_phy_release(struct device *dev)
|
|
|
static struct attribute *pmib_attrs[] = {
|
|
|
&dev_attr_index.attr,
|
|
|
&dev_attr_name.attr,
|
|
|
- /* below will be removed soon */
|
|
|
- &dev_attr_current_channel.attr,
|
|
|
- &dev_attr_current_page.attr,
|
|
|
- &dev_attr_channels_supported.attr,
|
|
|
- &dev_attr_transmit_power.attr,
|
|
|
- &dev_attr_cca_mode.attr,
|
|
|
NULL,
|
|
|
};
|
|
|
ATTRIBUTE_GROUPS(pmib);
|