Skip to content

L
linux
Commit 45bd07ad authored by Arvind Yadav's avatar Arvind Yadav Committed by Thomas Gleixner
Browse files
Options

x86: Constify attribute_group structures 

attribute_groups are not supposed to change at runtime and none of the
groups is modified.

Mark the non-const structs as const.

[ tglx: Folded into one big patch ]
Signed-off-by: default avatarArvind Yadav <arvind.yadav.cs@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: tony.luck@intel.com
Cc: bp@alien8.de
Link: http://lkml.kernel.org/r/1500550238-15655-2-git-send-email-arvind.yadav.cs@gmail.com
parent 187e91fe
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
arch/x86/events/intel/uncore.c
View file @ 45bd07ad
...@@ -721,7 +721,7 @@ static struct attribute *uncore_pmu_attrs[] = { ...@@ -721,7 +721,7 @@ static struct attribute *uncore_pmu_attrs[] = {
NULL, NULL,
}; };
static struct attribute_group uncore_pmu_attr_group = { static const struct attribute_group uncore_pmu_attr_group = {
.attrs = uncore_pmu_attrs, .attrs = uncore_pmu_attrs,
}; };
......
arch/x86/events/intel/uncore_nhmex.c
View file @ 45bd07ad
...@@ -272,7 +272,7 @@ static struct attribute *nhmex_uncore_ubox_formats_attr[] = { ...@@ -272,7 +272,7 @@ static struct attribute *nhmex_uncore_ubox_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group nhmex_uncore_ubox_format_group = { static const struct attribute_group nhmex_uncore_ubox_format_group = {
.name = "format", .name = "format",
.attrs = nhmex_uncore_ubox_formats_attr, .attrs = nhmex_uncore_ubox_formats_attr,
}; };
...@@ -299,7 +299,7 @@ static struct attribute *nhmex_uncore_cbox_formats_attr[] = { ...@@ -299,7 +299,7 @@ static struct attribute *nhmex_uncore_cbox_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group nhmex_uncore_cbox_format_group = { static const struct attribute_group nhmex_uncore_cbox_format_group = {
.name = "format", .name = "format",
.attrs = nhmex_uncore_cbox_formats_attr, .attrs = nhmex_uncore_cbox_formats_attr,
}; };
...@@ -407,7 +407,7 @@ static struct attribute *nhmex_uncore_bbox_formats_attr[] = { ...@@ -407,7 +407,7 @@ static struct attribute *nhmex_uncore_bbox_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group nhmex_uncore_bbox_format_group = { static const struct attribute_group nhmex_uncore_bbox_format_group = {
.name = "format", .name = "format",
.attrs = nhmex_uncore_bbox_formats_attr, .attrs = nhmex_uncore_bbox_formats_attr,
}; };
...@@ -484,7 +484,7 @@ static struct attribute *nhmex_uncore_sbox_formats_attr[] = { ...@@ -484,7 +484,7 @@ static struct attribute *nhmex_uncore_sbox_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group nhmex_uncore_sbox_format_group = { static const struct attribute_group nhmex_uncore_sbox_format_group = {
.name = "format", .name = "format",
.attrs = nhmex_uncore_sbox_formats_attr, .attrs = nhmex_uncore_sbox_formats_attr,
}; };
...@@ -898,7 +898,7 @@ static struct attribute *nhmex_uncore_mbox_formats_attr[] = { ...@@ -898,7 +898,7 @@ static struct attribute *nhmex_uncore_mbox_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group nhmex_uncore_mbox_format_group = { static const struct attribute_group nhmex_uncore_mbox_format_group = {
.name = "format", .name = "format",
.attrs = nhmex_uncore_mbox_formats_attr, .attrs = nhmex_uncore_mbox_formats_attr,
}; };
...@@ -1163,7 +1163,7 @@ static struct attribute *nhmex_uncore_rbox_formats_attr[] = { ...@@ -1163,7 +1163,7 @@ static struct attribute *nhmex_uncore_rbox_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group nhmex_uncore_rbox_format_group = { static const struct attribute_group nhmex_uncore_rbox_format_group = {
.name = "format", .name = "format",
.attrs = nhmex_uncore_rbox_formats_attr, .attrs = nhmex_uncore_rbox_formats_attr,
}; };
......
arch/x86/events/intel/uncore_snb.c
View file @ 45bd07ad
...@@ -130,7 +130,7 @@ static struct attribute *snb_uncore_formats_attr[] = { ...@@ -130,7 +130,7 @@ static struct attribute *snb_uncore_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group snb_uncore_format_group = { static const struct attribute_group snb_uncore_format_group = {
.name = "format", .name = "format",
.attrs = snb_uncore_formats_attr, .attrs = snb_uncore_formats_attr,
}; };
...@@ -289,7 +289,7 @@ static struct attribute *snb_uncore_imc_formats_attr[] = { ...@@ -289,7 +289,7 @@ static struct attribute *snb_uncore_imc_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group snb_uncore_imc_format_group = { static const struct attribute_group snb_uncore_imc_format_group = {
.name = "format", .name = "format",
.attrs = snb_uncore_imc_formats_attr, .attrs = snb_uncore_imc_formats_attr,
}; };
...@@ -769,7 +769,7 @@ static struct attribute *nhm_uncore_formats_attr[] = { ...@@ -769,7 +769,7 @@ static struct attribute *nhm_uncore_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group nhm_uncore_format_group = { static const struct attribute_group nhm_uncore_format_group = {
.name = "format", .name = "format",
.attrs = nhm_uncore_formats_attr, .attrs = nhm_uncore_formats_attr,
}; };
......
arch/x86/events/intel/uncore_snbep.c
View file @ 45bd07ad
...@@ -602,27 +602,27 @@ static struct uncore_event_desc snbep_uncore_qpi_events[] = { ...@@ -602,27 +602,27 @@ static struct uncore_event_desc snbep_uncore_qpi_events[] = {
{ /* end: all zeroes */ }, { /* end: all zeroes */ },
}; };
static struct attribute_group snbep_uncore_format_group = { static const struct attribute_group snbep_uncore_format_group = {
.name = "format", .name = "format",
.attrs = snbep_uncore_formats_attr, .attrs = snbep_uncore_formats_attr,
}; };
static struct attribute_group snbep_uncore_ubox_format_group = { static const struct attribute_group snbep_uncore_ubox_format_group = {
.name = "format", .name = "format",
.attrs = snbep_uncore_ubox_formats_attr, .attrs = snbep_uncore_ubox_formats_attr,
}; };
static struct attribute_group snbep_uncore_cbox_format_group = { static const struct attribute_group snbep_uncore_cbox_format_group = {
.name = "format", .name = "format",
.attrs = snbep_uncore_cbox_formats_attr, .attrs = snbep_uncore_cbox_formats_attr,
}; };
static struct attribute_group snbep_uncore_pcu_format_group = { static const struct attribute_group snbep_uncore_pcu_format_group = {
.name = "format", .name = "format",
.attrs = snbep_uncore_pcu_formats_attr, .attrs = snbep_uncore_pcu_formats_attr,
}; };
static struct attribute_group snbep_uncore_qpi_format_group = { static const struct attribute_group snbep_uncore_qpi_format_group = {
.name = "format", .name = "format",
.attrs = snbep_uncore_qpi_formats_attr, .attrs = snbep_uncore_qpi_formats_attr,
}; };
...@@ -1431,27 +1431,27 @@ static struct attribute *ivbep_uncore_qpi_formats_attr[] = { ...@@ -1431,27 +1431,27 @@ static struct attribute *ivbep_uncore_qpi_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group ivbep_uncore_format_group = { static const struct attribute_group ivbep_uncore_format_group = {
.name = "format", .name = "format",
.attrs = ivbep_uncore_formats_attr, .attrs = ivbep_uncore_formats_attr,
}; };
static struct attribute_group ivbep_uncore_ubox_format_group = { static const struct attribute_group ivbep_uncore_ubox_format_group = {
.name = "format", .name = "format",
.attrs = ivbep_uncore_ubox_formats_attr, .attrs = ivbep_uncore_ubox_formats_attr,
}; };
static struct attribute_group ivbep_uncore_cbox_format_group = { static const struct attribute_group ivbep_uncore_cbox_format_group = {
.name = "format", .name = "format",
.attrs = ivbep_uncore_cbox_formats_attr, .attrs = ivbep_uncore_cbox_formats_attr,
}; };
static struct attribute_group ivbep_uncore_pcu_format_group = { static const struct attribute_group ivbep_uncore_pcu_format_group = {
.name = "format", .name = "format",
.attrs = ivbep_uncore_pcu_formats_attr, .attrs = ivbep_uncore_pcu_formats_attr,
}; };
static struct attribute_group ivbep_uncore_qpi_format_group = { static const struct attribute_group ivbep_uncore_qpi_format_group = {
.name = "format", .name = "format",
.attrs = ivbep_uncore_qpi_formats_attr, .attrs = ivbep_uncore_qpi_formats_attr,
}; };
...@@ -1887,7 +1887,7 @@ static struct attribute *knl_uncore_ubox_formats_attr[] = { ...@@ -1887,7 +1887,7 @@ static struct attribute *knl_uncore_ubox_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group knl_uncore_ubox_format_group = { static const struct attribute_group knl_uncore_ubox_format_group = {
.name = "format", .name = "format",
.attrs = knl_uncore_ubox_formats_attr, .attrs = knl_uncore_ubox_formats_attr,
}; };
...@@ -1927,7 +1927,7 @@ static struct attribute *knl_uncore_cha_formats_attr[] = { ...@@ -1927,7 +1927,7 @@ static struct attribute *knl_uncore_cha_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group knl_uncore_cha_format_group = { static const struct attribute_group knl_uncore_cha_format_group = {
.name = "format", .name = "format",
.attrs = knl_uncore_cha_formats_attr, .attrs = knl_uncore_cha_formats_attr,
}; };
...@@ -2037,7 +2037,7 @@ static struct attribute *knl_uncore_pcu_formats_attr[] = { ...@@ -2037,7 +2037,7 @@ static struct attribute *knl_uncore_pcu_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group knl_uncore_pcu_format_group = { static const struct attribute_group knl_uncore_pcu_format_group = {
.name = "format", .name = "format",
.attrs = knl_uncore_pcu_formats_attr, .attrs = knl_uncore_pcu_formats_attr,
}; };
...@@ -2187,7 +2187,7 @@ static struct attribute *knl_uncore_irp_formats_attr[] = { ...@@ -2187,7 +2187,7 @@ static struct attribute *knl_uncore_irp_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group knl_uncore_irp_format_group = { static const struct attribute_group knl_uncore_irp_format_group = {
.name = "format", .name = "format",
.attrs = knl_uncore_irp_formats_attr, .attrs = knl_uncore_irp_formats_attr,
}; };
...@@ -2385,7 +2385,7 @@ static struct attribute *hswep_uncore_ubox_formats_attr[] = { ...@@ -2385,7 +2385,7 @@ static struct attribute *hswep_uncore_ubox_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group hswep_uncore_ubox_format_group = { static const struct attribute_group hswep_uncore_ubox_format_group = {
.name = "format", .name = "format",
.attrs = hswep_uncore_ubox_formats_attr, .attrs = hswep_uncore_ubox_formats_attr,
}; };
...@@ -2439,7 +2439,7 @@ static struct attribute *hswep_uncore_cbox_formats_attr[] = { ...@@ -2439,7 +2439,7 @@ static struct attribute *hswep_uncore_cbox_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group hswep_uncore_cbox_format_group = { static const struct attribute_group hswep_uncore_cbox_format_group = {
.name = "format", .name = "format",
.attrs = hswep_uncore_cbox_formats_attr, .attrs = hswep_uncore_cbox_formats_attr,
}; };
...@@ -2621,7 +2621,7 @@ static struct attribute *hswep_uncore_sbox_formats_attr[] = { ...@@ -2621,7 +2621,7 @@ static struct attribute *hswep_uncore_sbox_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group hswep_uncore_sbox_format_group = { static const struct attribute_group hswep_uncore_sbox_format_group = {
.name = "format", .name = "format",
.attrs = hswep_uncore_sbox_formats_attr, .attrs = hswep_uncore_sbox_formats_attr,
}; };
...@@ -3314,7 +3314,7 @@ static struct attribute *skx_uncore_cha_formats_attr[] = { ...@@ -3314,7 +3314,7 @@ static struct attribute *skx_uncore_cha_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group skx_uncore_chabox_format_group = { static const struct attribute_group skx_uncore_chabox_format_group = {
.name = "format", .name = "format",
.attrs = skx_uncore_cha_formats_attr, .attrs = skx_uncore_cha_formats_attr,
}; };
...@@ -3427,7 +3427,7 @@ static struct attribute *skx_uncore_iio_formats_attr[] = { ...@@ -3427,7 +3427,7 @@ static struct attribute *skx_uncore_iio_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group skx_uncore_iio_format_group = { static const struct attribute_group skx_uncore_iio_format_group = {
.name = "format", .name = "format",
.attrs = skx_uncore_iio_formats_attr, .attrs = skx_uncore_iio_formats_attr,
}; };
...@@ -3484,7 +3484,7 @@ static struct attribute *skx_uncore_formats_attr[] = { ...@@ -3484,7 +3484,7 @@ static struct attribute *skx_uncore_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group skx_uncore_format_group = { static const struct attribute_group skx_uncore_format_group = {
.name = "format", .name = "format",
.attrs = skx_uncore_formats_attr, .attrs = skx_uncore_formats_attr,
}; };
...@@ -3605,7 +3605,7 @@ static struct attribute *skx_upi_uncore_formats_attr[] = { ...@@ -3605,7 +3605,7 @@ static struct attribute *skx_upi_uncore_formats_attr[] = {
NULL, NULL,
}; };
static struct attribute_group skx_upi_uncore_format_group = { static const struct attribute_group skx_upi_uncore_format_group = {
.name = "format", .name = "format",
.attrs = skx_upi_uncore_formats_attr, .attrs = skx_upi_uncore_formats_attr,
}; };
......
arch/x86/kernel/cpu/mcheck/therm_throt.c
View file @ 45bd07ad
...@@ -122,7 +122,7 @@ static struct attribute *thermal_throttle_attrs[] = { ...@@ -122,7 +122,7 @@ static struct attribute *thermal_throttle_attrs[] = {
NULL NULL
}; };
static struct attribute_group thermal_attr_group = { static const struct attribute_group thermal_attr_group = {
.attrs = thermal_throttle_attrs, .attrs = thermal_throttle_attrs,
.name = "thermal_throttle" .name = "thermal_throttle"
}; };
......
arch/x86/kernel/cpu/microcode/core.c
View file @ 45bd07ad
...@@ -561,7 +561,7 @@ static struct attribute *mc_default_attrs[] = { ...@@ -561,7 +561,7 @@ static struct attribute *mc_default_attrs[] = {
NULL NULL
}; };
static struct attribute_group mc_attr_group = { static const struct attribute_group mc_attr_group = {
.attrs = mc_default_attrs, .attrs = mc_default_attrs,
.name = "microcode", .name = "microcode",
}; };
...@@ -707,7 +707,7 @@ static struct attribute *cpu_root_microcode_attrs[] = { ...@@ -707,7 +707,7 @@ static struct attribute *cpu_root_microcode_attrs[] = {
NULL NULL
}; };
static struct attribute_group cpu_root_microcode_group = { static const struct attribute_group cpu_root_microcode_group = {
.name = "microcode", .name = "microcode",
.attrs = cpu_root_microcode_attrs, .attrs = cpu_root_microcode_attrs,
}; };
......
arch/x86/kernel/ksysfs.c
View file @ 45bd07ad
...@@ -55,7 +55,7 @@ static struct bin_attribute *boot_params_data_attrs[] = { ...@@ -55,7 +55,7 @@ static struct bin_attribute *boot_params_data_attrs[] = {
NULL, NULL,
}; };
static struct attribute_group boot_params_attr_group = { static const struct attribute_group boot_params_attr_group = {
.attrs = boot_params_version_attrs, .attrs = boot_params_version_attrs,
.bin_attrs = boot_params_data_attrs, .bin_attrs = boot_params_data_attrs,
}; };
...@@ -202,7 +202,7 @@ static struct bin_attribute *setup_data_data_attrs[] = { ...@@ -202,7 +202,7 @@ static struct bin_attribute *setup_data_data_attrs[] = {
NULL, NULL,
}; };
static struct attribute_group setup_data_attr_group = { static const struct attribute_group setup_data_attr_group = {
.attrs = setup_data_type_attrs, .attrs = setup_data_type_attrs,
.bin_attrs = setup_data_data_attrs, .bin_attrs = setup_data_data_attrs,
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7