diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-06 18:34:37 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-06 18:34:37 +1100 |
commit | 71a51ca1cb676e188ee15cfdc350ee2f25501f99 (patch) | |
tree | b0d079b51fe7e1a829d7f5574d45e523b8d6c94e /kernel | |
parent | 09abe2adccdc9db313d8799f66c19ec95dbde552 (diff) | |
parent | 0cae60f91494e34a0c5391f1455f825d5849b05f (diff) |
Merge remote-tracking branch 'driver-core/driver-core-next'
Conflicts:
drivers/mmc/host/mvsdio.c
drivers/pci/pci-driver.c
drivers/pci/pci-sysfs.c
include/linux/netdevice.h
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/events/core.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c index 17b3c6cf1606..65f8ec97285c 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -6332,6 +6332,7 @@ type_show(struct device *dev, struct device_attribute *attr, char *page) return snprintf(page, PAGE_SIZE-1, "%d\n", pmu->type); } +static DEVICE_ATTR_RO(type); static ssize_t perf_event_mux_interval_ms_show(struct device *dev, @@ -6376,17 +6377,19 @@ perf_event_mux_interval_ms_store(struct device *dev, return count; } +static DEVICE_ATTR_RW(perf_event_mux_interval_ms); -static struct device_attribute pmu_dev_attrs[] = { - __ATTR_RO(type), - __ATTR_RW(perf_event_mux_interval_ms), - __ATTR_NULL, +static struct attribute *pmu_dev_attrs[] = { + &dev_attr_type.attr, + &dev_attr_perf_event_mux_interval_ms.attr, + NULL, }; +ATTRIBUTE_GROUPS(pmu_dev); static int pmu_bus_running; static struct bus_type pmu_bus = { .name = "event_source", - .dev_attrs = pmu_dev_attrs, + .dev_groups = pmu_dev_groups, }; static void pmu_dev_release(struct device *dev) |