Commit d5b73506 authored by Alexander Antonov's avatar Alexander Antonov Committed by Peter Zijlstra
Browse files

perf/x86/intel/uncore: Make set_mapping() procedure void 



Return value of set_mapping() is not needed to be checked anymore.
So, make this procedure void.

Signed-off-by: default avatarAlexander Antonov <alexander.antonov@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Link: https://lore.kernel.org/r/20221117122833.3103580-12-alexander.antonov@linux.intel.com
parent 61fb0f7e

arch/x86/events/intel/uncore.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct intel_uncore_type { 
	 * Optional callbacks for managing mapping of Uncore units to PMONs

	 */

	int (*get_topology)(struct intel_uncore_type *type);

	int (*set_mapping)(struct intel_uncore_type *type);

	void (*set_mapping)(struct intel_uncore_type *type);

	void (*cleanup_mapping)(struct intel_uncore_type *type);

};

arch/x86/events/intel/uncore_snbep.c

+19 −22
Original line number Diff line number Diff line
@@ -3924,7 +3924,7 @@ static void pmu_clear_mapping_attr(const struct attribute_group **groups, 
	}

}



static int

static void

pmu_set_mapping(struct intel_uncore_type *type, struct attribute_group *ag,

		ssize_t (*show)(struct device*, struct device_attribute*, char*),

		int topology_type)
@@ -3943,8 +3943,6 @@ pmu_set_mapping(struct intel_uncore_type *type, struct attribute_group *ag, 
	if (ret < 0)

		goto clear_topology;



	ret = -ENOMEM;



	/* One more for NULL. */

	attrs = kcalloc((uncore_max_dies() + 1), sizeof(*attrs), GFP_KERNEL);

	if (!attrs)
@@ -3968,7 +3966,7 @@ pmu_set_mapping(struct intel_uncore_type *type, struct attribute_group *ag, 
	}

	ag->attrs = attrs;



	return 0;

	return;

err:

	for (; die >= 0; die--)

		kfree(eas[die].attr.attr.name);
@@ -3979,7 +3977,6 @@ pmu_set_mapping(struct intel_uncore_type *type, struct attribute_group *ag, 
	pmu_free_topology(type);

clear_attr_update:

	pmu_clear_mapping_attr(type->attr_update, ag);

	return ret;

}



static void
@@ -3998,15 +3995,15 @@ pmu_cleanup_mapping(struct intel_uncore_type *type, struct attribute_group *ag) 
	pmu_free_topology(type);

}



static int

static void

pmu_iio_set_mapping(struct intel_uncore_type *type, struct attribute_group *ag)

{

	return pmu_set_mapping(type, ag, skx_iio_mapping_show, IIO_TOPOLOGY_TYPE);

	pmu_set_mapping(type, ag, skx_iio_mapping_show, IIO_TOPOLOGY_TYPE);

}



static int skx_iio_set_mapping(struct intel_uncore_type *type)

static void skx_iio_set_mapping(struct intel_uncore_type *type)

{

	return pmu_iio_set_mapping(type, &skx_iio_mapping_group);

	pmu_iio_set_mapping(type, &skx_iio_mapping_group);

}



static void skx_iio_cleanup_mapping(struct intel_uncore_type *type)
@@ -4382,15 +4379,15 @@ static const struct attribute_group *skx_upi_attr_update[] = { 
	NULL

};



static int

static void

pmu_upi_set_mapping(struct intel_uncore_type *type, struct attribute_group *ag)

{

	return pmu_set_mapping(type, ag, skx_upi_mapping_show, UPI_TOPOLOGY_TYPE);

	pmu_set_mapping(type, ag, skx_upi_mapping_show, UPI_TOPOLOGY_TYPE);

}



static int skx_upi_set_mapping(struct intel_uncore_type *type)

static void skx_upi_set_mapping(struct intel_uncore_type *type)

{

	return pmu_upi_set_mapping(type, &skx_upi_mapping_group);

	pmu_upi_set_mapping(type, &skx_upi_mapping_group);

}



static void skx_upi_cleanup_mapping(struct intel_uncore_type *type)
@@ -4773,9 +4770,9 @@ static int snr_iio_get_topology(struct intel_uncore_type *type) 
	return sad_cfg_iio_topology(type, snr_sad_pmon_mapping);

}



static int snr_iio_set_mapping(struct intel_uncore_type *type)

static void snr_iio_set_mapping(struct intel_uncore_type *type)

{

	return pmu_iio_set_mapping(type, &snr_iio_mapping_group);

	pmu_iio_set_mapping(type, &snr_iio_mapping_group);

}



static void snr_iio_cleanup_mapping(struct intel_uncore_type *type)
@@ -5391,14 +5388,14 @@ static int icx_iio_get_topology(struct intel_uncore_type *type) 
	return sad_cfg_iio_topology(type, icx_sad_pmon_mapping);

}



static int icx_iio_set_mapping(struct intel_uncore_type *type)

static void icx_iio_set_mapping(struct intel_uncore_type *type)

{

	/* Detect ICX-D system. This case is not supported */

	if (boot_cpu_data.x86_model == INTEL_FAM6_ICELAKE_D) {

		pmu_clear_mapping_attr(type->attr_update, &icx_iio_mapping_group);

		return -EPERM;

		return;

	}

	return pmu_iio_set_mapping(type, &icx_iio_mapping_group);

	pmu_iio_set_mapping(type, &icx_iio_mapping_group);

}



static void icx_iio_cleanup_mapping(struct intel_uncore_type *type)
@@ -5656,9 +5653,9 @@ static const struct attribute_group *icx_upi_attr_update[] = { 
	NULL

};



static int icx_upi_set_mapping(struct intel_uncore_type *type)

static void icx_upi_set_mapping(struct intel_uncore_type *type)

{

	return pmu_upi_set_mapping(type, &icx_upi_mapping_group);

	pmu_upi_set_mapping(type, &icx_upi_mapping_group);

}



static void icx_upi_cleanup_mapping(struct intel_uncore_type *type)
@@ -6125,9 +6122,9 @@ static const struct attribute_group *spr_upi_attr_update[] = { 


#define SPR_UPI_REGS_ADDR_DEVICE_LINK0	0x01



static int spr_upi_set_mapping(struct intel_uncore_type *type)

static void spr_upi_set_mapping(struct intel_uncore_type *type)

{

	return pmu_upi_set_mapping(type, &spr_upi_mapping_group);

	pmu_upi_set_mapping(type, &spr_upi_mapping_group);

}



static void spr_upi_cleanup_mapping(struct intel_uncore_type *type)