Commit b91b73a4 authored by Lukas Wunner's avatar Lukas Wunner Committed by Greg Kroah-Hartman
Browse files

perf: Use device_show_string() helper for sysfs attributes 



Deduplicate sysfs ->show() callbacks which expose a string at a static
memory location.  Use the newly introduced device_show_string() helper
in the driver core instead by declaring those sysfs attributes with
DEVICE_STRING_ATTR_RO().

No functional change intended.

Signed-off-by: default avatarLukas Wunner <lukas@wunner.de>
Link: https://lore.kernel.org/r/3a297850312b4ecb62d6872121de04496900f502.1713608122.git.lukas@wunner.de


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7b53e926

arch/x86/events/intel/core.c

+3 −10
Original line number Diff line number Diff line
@@ -5645,17 +5645,10 @@ lbr_is_visible(struct kobject *kobj, struct attribute *attr, int i) 


static char pmu_name_str[30];



static ssize_t pmu_name_show(struct device *cdev,

			     struct device_attribute *attr,

			     char *buf)

{

	return snprintf(buf, PAGE_SIZE, "%s\n", pmu_name_str);

}



static DEVICE_ATTR_RO(pmu_name);

static DEVICE_STRING_ATTR_RO(pmu_name, 0444, pmu_name_str);



static struct attribute *intel_pmu_caps_attrs[] = {

       &dev_attr_pmu_name.attr,

	&dev_attr_pmu_name.attr.attr,

	NULL

};

drivers/perf/alibaba_uncore_drw_pmu.c

+2 −10
Original line number Diff line number Diff line
@@ -236,24 +236,16 @@ static const struct attribute_group ali_drw_pmu_cpumask_attr_group = { 
	.attrs = ali_drw_pmu_cpumask_attrs,

};



static ssize_t ali_drw_pmu_identifier_show(struct device *dev,

					struct device_attribute *attr,

					char *page)

{

	return sysfs_emit(page, "%s\n", "ali_drw_pmu");

}



static umode_t ali_drw_pmu_identifier_attr_visible(struct kobject *kobj,

						struct attribute *attr, int n)

{

	return attr->mode;

}



static struct device_attribute ali_drw_pmu_identifier_attr =

	__ATTR(identifier, 0444, ali_drw_pmu_identifier_show, NULL);

static DEVICE_STRING_ATTR_RO(ali_drw_pmu_identifier, 0444, "ali_drw_pmu");



static struct attribute *ali_drw_pmu_identifier_attrs[] = {

	&ali_drw_pmu_identifier_attr.attr,

	&dev_attr_ali_drw_pmu_identifier.attr.attr,

	NULL

};

drivers/perf/arm-cci.c

+1 −11
Original line number Diff line number Diff line
@@ -127,8 +127,6 @@ enum cci_models { 


static void pmu_write_counters(struct cci_pmu *cci_pmu,

				 unsigned long *mask);

static ssize_t __maybe_unused cci_pmu_format_show(struct device *dev,

			struct device_attribute *attr, char *buf);

static ssize_t __maybe_unused cci_pmu_event_show(struct device *dev,

			struct device_attribute *attr, char *buf);
@@ -138,7 +136,7 @@ static ssize_t __maybe_unused cci_pmu_event_show(struct device *dev, 
	})[0].attr.attr



#define CCI_FORMAT_EXT_ATTR_ENTRY(_name, _config) \

	CCI_EXT_ATTR_ENTRY(_name, cci_pmu_format_show, (char *)_config)

	CCI_EXT_ATTR_ENTRY(_name, device_show_string, _config)

#define CCI_EVENT_EXT_ATTR_ENTRY(_name, _config) \

	CCI_EXT_ATTR_ENTRY(_name, cci_pmu_event_show, (unsigned long)_config)
@@ -688,14 +686,6 @@ static void __cci_pmu_disable(struct cci_pmu *cci_pmu) 
	writel(val, cci_pmu->ctrl_base + CCI_PMCR);

}



static ssize_t cci_pmu_format_show(struct device *dev,

			struct device_attribute *attr, char *buf)

{

	struct dev_ext_attribute *eattr = container_of(attr,

				struct dev_ext_attribute, attr);

	return sysfs_emit(buf, "%s\n", (char *)eattr->var);

}



static ssize_t cci_pmu_event_show(struct device *dev,

			struct device_attribute *attr, char *buf)

{

drivers/perf/arm-ccn.c

+1 −10
Original line number Diff line number Diff line
@@ -215,18 +215,9 @@ static void arm_ccn_pmu_config_set(u64 *config, u32 node_xp, u32 type, u32 port) 
	*config |= (node_xp << 0) | (type << 8) | (port << 24);

}



static ssize_t arm_ccn_pmu_format_show(struct device *dev,

		struct device_attribute *attr, char *buf)

{

	struct dev_ext_attribute *ea = container_of(attr,

			struct dev_ext_attribute, attr);



	return sysfs_emit(buf, "%s\n", (char *)ea->var);

}



#define CCN_FORMAT_ATTR(_name, _config) \

	struct dev_ext_attribute arm_ccn_pmu_format_attr_##_name = \

			{ __ATTR(_name, S_IRUGO, arm_ccn_pmu_format_show, \

			{ __ATTR(_name, S_IRUGO, device_show_string, \

			NULL), _config }



static CCN_FORMAT_ATTR(node, "config:0-7");

drivers/perf/arm_cspmu/arm_cspmu.c

+0 −10
Original line number Diff line number Diff line
@@ -223,16 +223,6 @@ arm_cspmu_event_attr_is_visible(struct kobject *kobj, 
	return attr->mode;

}



ssize_t arm_cspmu_sysfs_format_show(struct device *dev,

				struct device_attribute *attr,

				char *buf)

{

	struct dev_ext_attribute *eattr =

		container_of(attr, struct dev_ext_attribute, attr);

	return sysfs_emit(buf, "%s\n", (char *)eattr->var);

}

EXPORT_SYMBOL_GPL(arm_cspmu_sysfs_format_show);



static struct attribute *arm_cspmu_format_attrs[] = {

	ARM_CSPMU_FORMAT_EVENT_ATTR,

	ARM_CSPMU_FORMAT_FILTER_ATTR,