From bb9e42bcfe86a70baaf3bc0b5546225766dcff4a Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 28 Nov 2010 12:22:52 +0100 Subject: [PATCH] --- yaml --- r: 224891 b: refs/heads/master c: aa3bf280dd3214db5b9e1f8cad7c5868ccbe71b7 h: refs/heads/master i: 224889: f806e00c2fcda48fff1ef62e5ecc30ae051f6897 224887: a60ea01de413b8834327b0523c86c9cf030ebed9 v: v3 --- [refs] | 2 +- trunk/drivers/ssb/main.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index c6da83d146d6..194a18222420 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 172c69a47675dc1ca9c7243c031d8d77701bccc0 +refs/heads/master: aa3bf280dd3214db5b9e1f8cad7c5868ccbe71b7 diff --git a/trunk/drivers/ssb/main.c b/trunk/drivers/ssb/main.c index c68b3dc19e11..3918d2cc5856 100644 --- a/trunk/drivers/ssb/main.c +++ b/trunk/drivers/ssb/main.c @@ -383,6 +383,35 @@ static int ssb_device_uevent(struct device *dev, struct kobj_uevent_env *env) ssb_dev->id.revision); } +#define ssb_config_attr(attrib, field, format_string) \ +static ssize_t \ +attrib##_show(struct device *dev, struct device_attribute *attr, char *buf) \ +{ \ + return sprintf(buf, format_string, dev_to_ssb_dev(dev)->field); \ +} + +ssb_config_attr(core_num, core_index, "%u\n") +ssb_config_attr(coreid, id.coreid, "0x%04x\n") +ssb_config_attr(vendor, id.vendor, "0x%04x\n") +ssb_config_attr(revision, id.revision, "%u\n") +ssb_config_attr(irq, irq, "%u\n") +static ssize_t +name_show(struct device *dev, struct device_attribute *attr, char *buf) +{ + return sprintf(buf, "%s\n", + ssb_core_name(dev_to_ssb_dev(dev)->id.coreid)); +} + +static struct device_attribute ssb_device_attrs[] = { + __ATTR_RO(name), + __ATTR_RO(core_num), + __ATTR_RO(coreid), + __ATTR_RO(vendor), + __ATTR_RO(revision), + __ATTR_RO(irq), + __ATTR_NULL, +}; + static struct bus_type ssb_bustype = { .name = "ssb", .match = ssb_bus_match, @@ -392,6 +421,7 @@ static struct bus_type ssb_bustype = { .suspend = ssb_device_suspend, .resume = ssb_device_resume, .uevent = ssb_device_uevent, + .dev_attrs = ssb_device_attrs, }; static void ssb_buses_lock(void)