powerpc: declare unmodified attribute_group usages const
Subsystems (2)
PATCH v3 1/1 powerpc: declare unmodified attribute_group usages const
Inspired by (bd75b4ef4977: Constify static attribute_group structs), accepted by linux-next, reported:
https://patchwork.ozlabs.org/project/linuxppc-dev/patch/[email protected]/
Nearly all singletons of type struct attribute_group are never modified, and so
are candidates for being const. Declare them as const.
--- arch/powerpc/include/asm/spu.h | 4 ++-- arch/powerpc/perf/generic-compat-pmu.c | 4 ++-- arch/powerpc/perf/hv-24x7.c | 6 +++--- arch/powerpc/perf/hv-gpci.c | 8 ++++---- arch/powerpc/perf/imc-pmu.c | 6 +++--- arch/powerpc/perf/isa207-common.c | 2 +- arch/powerpc/perf/power10-pmu.c | 6 +++--- arch/powerpc/perf/power7-pmu.c | 4 ++-- arch/powerpc/perf/power8-pmu.c | 4 ++-- arch/powerpc/perf/power9-pmu.c | 6 +++--- arch/powerpc/platforms/cell/cbe_thermal.c | 2 +- arch/powerpc/platforms/cell/spu_base.c | 4 ++-- arch/powerpc/platforms/powernv/opal-core.c | 2 +- arch/powerpc/platforms/powernv/opal-dump.c | 2 +- arch/powerpc/platforms/powernv/opal-flash.c | 2 +- arch/powerpc/platforms/pseries/papr_scm.c | 2 +- arch/powerpc/platforms/pseries/power.c | 2 +- 17 files changed, 33 insertions(+), 33 deletions(-)
arch/powerpc/include/asm/spu.h +2 -2
@@ -249,8 +249,8 @@ void unregister_spu_syscalls(struct spufs_calls *calls);int spu_add_dev_attr (struct device_attribute *attr);void spu_remove_dev_attr (struct device_attribute *attr); -int spu_add_dev_attr_group (struct attribute_group *attrs); -void spu_remove_dev_attr_group (struct attribute_group *attrs); +int spu_add_dev_attr_group (const struct attribute_group *attrs); +void spu_remove_dev_attr_group (const struct attribute_group *attrs);extern void notify_spus_active (void );extern void do_notify_spus_active (void );
arch/powerpc/perf/generic-compat-pmu.c +2 -2
@@ -130,7 +130,7 @@ static struct attribute *generic_compat_events_attr[] = { NULL }; -static struct attribute_group generic_compat_pmu_events_group = { +static const struct attribute_group generic_compat_pmu_events_group = { .name ="events" , .attrs = generic_compat_events_attr, };
@@ -146,7 +146,7 @@ static struct attribute *generic_compat_pmu_format_attr[] = { NULL, }; -static struct attribute_group generic_compat_pmu_format_group = { +static const struct attribute_group generic_compat_pmu_format_group = { .name ="format" , .attrs = generic_compat_pmu_format_attr, };
arch/powerpc/perf/hv-24x7.c +3 -3
@@ -204,7 +204,7 @@ static struct attribute *format_attrs[] = { NULL, }; -static struct attribute_group format_group = { +static const struct attribute_group format_group = { .name ="format" , .attrs = format_attrs, };
@@ -1148,7 +1148,7 @@ static struct attribute *cpumask_attrs[] = { NULL, }; -static struct attribute_group cpumask_attr_group = { +static const struct attribute_group cpumask_attr_group = { .attrs = cpumask_attrs, };
@@ -1162,7 +1162,7 @@ static struct attribute *if_attrs[] = { NULL, }; -static struct attribute_group if_group = { +static const struct attribute_group if_group = { .name ="interface" , .bin_attrs = if_bin_attrs, .attrs = if_attrs,
arch/powerpc/perf/hv-gpci.c +4 -4
@@ -65,12 +65,12 @@ static struct attribute *format_attrs[] = { NULL, }; -static struct attribute_group format_group = { +static const struct attribute_group format_group = { .name ="format" , .attrs = format_attrs, }; -static struct attribute_group event_group = { +static const struct attribute_group event_group = { .name ="events" , .attrs = hv_gpci_event_attrs, };
@@ -126,11 +126,11 @@ static struct attribute *cpumask_attrs[] = { NULL, }; -static struct attribute_group cpumask_attr_group = { +static const struct attribute_group cpumask_attr_group = { .attrs = cpumask_attrs, }; -static struct attribute_group interface_group = { +static const struct attribute_group interface_group = { .name ="interface" , .attrs = interface_attrs, };
arch/powerpc/perf/imc-pmu.c +3 -3
@@ -71,7 +71,7 @@ static struct attribute *imc_format_attrs[] = { NULL, }; -static struct attribute_group imc_format_group = { +static const struct attribute_group imc_format_group = { .name ="format" , .attrs = imc_format_attrs, };
@@ -90,7 +90,7 @@ static struct attribute *trace_imc_format_attrs[] = { NULL, }; -static struct attribute_group trace_imc_format_group = { +static const struct attribute_group trace_imc_format_group = { .name ="format" , .attrs = trace_imc_format_attrs, };
@@ -125,7 +125,7 @@ static struct attribute *imc_pmu_cpumask_attrs[] = { NULL, }; -static struct attribute_group imc_pmu_cpumask_attr_group = { +static const struct attribute_group imc_pmu_cpumask_attr_group = { .attrs = imc_pmu_cpumask_attrs, };
arch/powerpc/perf/isa207-common.c +1 -1
@@ -37,7 +37,7 @@ static struct attribute *isa207_pmu_format_attr[] = { NULL, }; -struct attribute_group isa207_pmu_format_group = { +const struct attribute_group isa207_pmu_format_group = { .name ="format" , .attrs = isa207_pmu_format_attr, };
arch/powerpc/perf/power10-pmu.c +3 -3
@@ -200,12 +200,12 @@ static struct attribute *power10_events_attr[] = { NULL }; -static struct attribute_group power10_pmu_events_group_dd1 = { +static const struct attribute_group power10_pmu_events_group_dd1 = { .name ="events" , .attrs = power10_events_attr_dd1, }; -static struct attribute_group power10_pmu_events_group = { +static const struct attribute_group power10_pmu_events_group = { .name ="events" , .attrs = power10_events_attr, };
@@ -253,7 +253,7 @@ static struct attribute *power10_pmu_format_attr[] = { NULL, }; -static struct attribute_group power10_pmu_format_group = { +static const struct attribute_group power10_pmu_format_group = { .name ="format" , .attrs = power10_pmu_format_attr, };
arch/powerpc/perf/power7-pmu.c +2 -2
@@ -405,7 +405,7 @@ static struct attribute *power7_events_attr[] = { NULL }; -static struct attribute_group power7_pmu_events_group = { +static const struct attribute_group power7_pmu_events_group = { .name ="events" , .attrs = power7_events_attr, };
@@ -417,7 +417,7 @@ static struct attribute *power7_pmu_format_attr[] = { NULL, }; -static struct attribute_group power7_pmu_format_group = { +static const struct attribute_group power7_pmu_format_group = { .name ="format" , .attrs = power7_pmu_format_attr, };
arch/powerpc/perf/power8-pmu.c +2 -2
@@ -92,7 +92,7 @@ enum {*/ /* PowerISA v2.07 format attribute structure*/ -extern struct attribute_group isa207_pmu_format_group; +extern const struct attribute_group isa207_pmu_format_group;/* Table of alternatives, sorted by column 0 */ static const unsigned int event_alternatives[][MAX_ALT ] = {
@@ -182,7 +182,7 @@ static struct attribute *power8_events_attr[] = { NULL }; -static struct attribute_group power8_pmu_events_group = { +static const struct attribute_group power8_pmu_events_group = { .name ="events" , .attrs = power8_events_attr, };
arch/powerpc/perf/power9-pmu.c +3 -3
@@ -96,7 +96,7 @@ extern u64 PERF_REG_EXTENDED_MASK;#define PVR_POWER9_CUMULUS 0x00002000/* PowerISA v2.07 format attribute structure*/ -extern struct attribute_group isa207_pmu_format_group; +extern const struct attribute_group isa207_pmu_format_group;int p9_dd21_bl_ev[] = {PM_MRK_ST_DONE_L2 ,
@@ -217,7 +217,7 @@ static struct attribute *power9_events_attr[] = { NULL }; -static struct attribute_group power9_pmu_events_group = { +static const struct attribute_group power9_pmu_events_group = { .name ="events" , .attrs = power9_events_attr, };
@@ -253,7 +253,7 @@ static struct attribute *power9_pmu_format_attr[] = { NULL, }; -static struct attribute_group power9_pmu_format_group = { +static const struct attribute_group power9_pmu_format_group = { .name ="format" , .attrs = power9_pmu_format_attr, };
arch/powerpc/platforms/cell/cbe_thermal.c +1 -1
@@ -255,7 +255,7 @@ static struct attribute *spu_attributes[] = { NULL, }; -static struct attribute_group spu_attribute_group = { +static const struct attribute_group spu_attribute_group = { .name ="thermal" , .attrs = spu_attributes, };
arch/powerpc/platforms/cell/spu_base.c +2 -2
@@ -490,7 +490,7 @@ int spu_add_dev_attr(struct device_attribute *attr) }EXPORT_SYMBOL_GPL (spu_add_dev_attr); -int spu_add_dev_attr_group (struct attribute_group *attrs) +int spu_add_dev_attr_group (const struct attribute_group *attrs) {struct spu *spu;int rc =0 ;
@@ -529,7 +529,7 @@ void spu_remove_dev_attr(struct device_attribute *attr) }EXPORT_SYMBOL_GPL (spu_remove_dev_attr); -void spu_remove_dev_attr_group (struct attribute_group *attrs) +void spu_remove_dev_attr_group (const struct attribute_group *attrs) {struct spu *spu;
arch/powerpc/platforms/powernv/opal-core.c +1 -1
@@ -603,7 +603,7 @@ static struct bin_attribute *mpipl_bin_attr[] = { }; -static struct attribute_group mpipl_group = { +static const struct attribute_group mpipl_group = { .attrs = mpipl_attr, .bin_attrs = mpipl_bin_attr, };
arch/powerpc/platforms/powernv/opal-dump.c +1 -1
@@ -150,7 +150,7 @@ static struct attribute *initiate_attrs[] = { NULL, }; -static struct attribute_group initiate_attr_group = { +static const struct attribute_group initiate_attr_group = { .attrs = initiate_attrs, };
arch/powerpc/platforms/powernv/opal-flash.c +1 -1
@@ -512,7 +512,7 @@ static struct attribute *image_op_attrs[] = { NULL /* need to NULL terminate the list of attributes */ }; -static struct attribute_group image_op_attr_group = { +static const struct attribute_group image_op_attr_group = { .attrs = image_op_attrs, };
arch/powerpc/platforms/pseries/papr_scm.c +1 -1
@@ -1039,7 +1039,7 @@ static struct attribute *papr_nd_attributes[] = { NULL, }; -static struct attribute_group papr_nd_attribute_group = { +static const struct attribute_group papr_nd_attribute_group = { .name ="papr" , .is_visible = papr_nd_attribute_visible, .attrs = papr_nd_attributes,
arch/powerpc/platforms/pseries/power.c +1 -1
@@ -51,7 +51,7 @@ static struct attribute *g[] = { NULL, }; -static struct attribute_group attr_group = { +static const struct attribute_group attr_group = { .attrs = g, };
Signature · 1 line
2.35.1
Michael Ellerman
AppliedQuoted 9 lines · Rohan McLure
Inspired by (
bd75b4ef4977: Constify staticattribute_groupstructs), accepted by linux-next, reported:
https://patchwork.ozlabs.org/project/linuxppc-dev/patch/[email protected]/Nearly all singletons of type struct
attribute_groupare never modified, and so
are candidates for being const. Declare them as const.[...]
Applied to powerpc/next.
[1/1] powerpc: declare unmodified attribute_group usages const
https://git.kernel.org/powerpc/c/6b3a3e12f8e6eea47428bb39aaf58832b50bb379
cheers