Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90826ca7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

pmu_bus: convert bus code to use dev_groups 



The dev_attrs field of struct bus_type is going away soon, dev_groups
should be used instead.  This converts the pmu bus code to use
the correct field.

Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c88dc555

kernel/events/core.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -6271,6 +6271,7 @@ type_show(struct device *dev, struct device_attribute *attr, char *page) 




	return snprintf(page, PAGE_SIZE-1, "%d\n", pmu->type);

	return snprintf(page, PAGE_SIZE-1, "%d\n", pmu->type);

}

}

static DEVICE_ATTR_RO(type);





static ssize_t

static ssize_t

perf_event_mux_interval_ms_show(struct device *dev,

perf_event_mux_interval_ms_show(struct device *dev,
@@ -6315,17 +6316,19 @@ perf_event_mux_interval_ms_store(struct device *dev, 




	return count;

	return count;

}

}

static DEVICE_ATTR_RW(perf_event_mux_interval_ms);





static struct device_attribute pmu_dev_attrs[] = {

static struct attribute *pmu_dev_attrs[] = {

	__ATTR_RO(type),

	&dev_attr_type.attr,

	__ATTR_RW(perf_event_mux_interval_ms),

	&dev_attr_perf_event_mux_interval_ms.attr,

	__ATTR_NULL,

	NULL,

};

};

ATTRIBUTE_GROUPS(pmu_dev);





static int pmu_bus_running;

static int pmu_bus_running;

static struct bus_type pmu_bus = {

static struct bus_type pmu_bus = {

	.name		= "event_source",

	.name		= "event_source",

	.dev_attrs	= pmu_dev_attrs,

	.dev_groups	= pmu_dev_groups,

};

};





static void pmu_dev_release(struct device *dev)

static void pmu_dev_release(struct device *dev)