mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
sysfs: treewide: switch back to attribute_group::bin_attrs
The normal bin_attrs field can now handle const pointers. This makes the _new variant unnecessary. Switch all users back. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Link: https://lore.kernel.org/r/20250530-sysfs-const-bin_attr-final-v3-4-724bfcf05b99@weissschuh.net Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
2fbe82037a
commit
fb506e31b3
@@ -121,7 +121,7 @@ static struct attribute *secvar_attrs[] = {
|
||||
|
||||
static const struct attribute_group secvar_attr_group = {
|
||||
.attrs = secvar_attrs,
|
||||
.bin_attrs_new = secvar_bin_attrs,
|
||||
.bin_attrs = secvar_bin_attrs,
|
||||
};
|
||||
__ATTRIBUTE_GROUPS(secvar_attr);
|
||||
|
||||
|
||||
@@ -1141,7 +1141,7 @@ static struct attribute *if_attrs[] = {
|
||||
|
||||
static const struct attribute_group if_group = {
|
||||
.name = "interface",
|
||||
.bin_attrs_new = if_bin_attrs,
|
||||
.bin_attrs = if_bin_attrs,
|
||||
.attrs = if_attrs,
|
||||
};
|
||||
|
||||
|
||||
@@ -607,7 +607,7 @@ static const struct bin_attribute *const mpipl_bin_attr[] = {
|
||||
|
||||
static const struct attribute_group mpipl_group = {
|
||||
.attrs = mpipl_attr,
|
||||
.bin_attrs_new = mpipl_bin_attr,
|
||||
.bin_attrs = mpipl_bin_attr,
|
||||
};
|
||||
|
||||
static int __init opalcore_init(void)
|
||||
|
||||
@@ -101,7 +101,7 @@ static const struct bin_attribute *const cpacf_attrs[] = {
|
||||
|
||||
static const struct attribute_group cpacf_attr_grp = {
|
||||
.name = "cpacf",
|
||||
.bin_attrs_new = cpacf_attrs,
|
||||
.bin_attrs = cpacf_attrs,
|
||||
};
|
||||
|
||||
static int __init cpacf_init(void)
|
||||
|
||||
@@ -596,7 +596,7 @@ static struct attribute *ipl_fcp_attrs[] = {
|
||||
|
||||
static const struct attribute_group ipl_fcp_attr_group = {
|
||||
.attrs = ipl_fcp_attrs,
|
||||
.bin_attrs_new = ipl_fcp_bin_attrs,
|
||||
.bin_attrs = ipl_fcp_bin_attrs,
|
||||
};
|
||||
|
||||
static struct attribute *ipl_nvme_attrs[] = {
|
||||
@@ -610,7 +610,7 @@ static struct attribute *ipl_nvme_attrs[] = {
|
||||
|
||||
static const struct attribute_group ipl_nvme_attr_group = {
|
||||
.attrs = ipl_nvme_attrs,
|
||||
.bin_attrs_new = ipl_nvme_bin_attrs,
|
||||
.bin_attrs = ipl_nvme_bin_attrs,
|
||||
};
|
||||
|
||||
static struct attribute *ipl_eckd_attrs[] = {
|
||||
@@ -623,7 +623,7 @@ static struct attribute *ipl_eckd_attrs[] = {
|
||||
|
||||
static const struct attribute_group ipl_eckd_attr_group = {
|
||||
.attrs = ipl_eckd_attrs,
|
||||
.bin_attrs_new = ipl_eckd_bin_attrs,
|
||||
.bin_attrs = ipl_eckd_bin_attrs,
|
||||
};
|
||||
|
||||
/* CCW ipl device attributes */
|
||||
@@ -920,7 +920,7 @@ static struct attribute *reipl_fcp_attrs[] = {
|
||||
|
||||
static const struct attribute_group reipl_fcp_attr_group = {
|
||||
.attrs = reipl_fcp_attrs,
|
||||
.bin_attrs_new = reipl_fcp_bin_attrs,
|
||||
.bin_attrs = reipl_fcp_bin_attrs,
|
||||
};
|
||||
|
||||
static struct kobj_attribute sys_reipl_fcp_clear_attr =
|
||||
@@ -958,7 +958,7 @@ static struct attribute *reipl_nvme_attrs[] = {
|
||||
|
||||
static const struct attribute_group reipl_nvme_attr_group = {
|
||||
.attrs = reipl_nvme_attrs,
|
||||
.bin_attrs_new = reipl_nvme_bin_attrs
|
||||
.bin_attrs = reipl_nvme_bin_attrs
|
||||
};
|
||||
|
||||
static ssize_t reipl_nvme_clear_show(struct kobject *kobj,
|
||||
@@ -1051,7 +1051,7 @@ static struct attribute *reipl_eckd_attrs[] = {
|
||||
|
||||
static const struct attribute_group reipl_eckd_attr_group = {
|
||||
.attrs = reipl_eckd_attrs,
|
||||
.bin_attrs_new = reipl_eckd_bin_attrs
|
||||
.bin_attrs = reipl_eckd_bin_attrs
|
||||
};
|
||||
|
||||
static ssize_t reipl_eckd_clear_show(struct kobject *kobj,
|
||||
@@ -1596,7 +1596,7 @@ static const struct bin_attribute *const dump_fcp_bin_attrs[] = {
|
||||
static const struct attribute_group dump_fcp_attr_group = {
|
||||
.name = IPL_FCP_STR,
|
||||
.attrs = dump_fcp_attrs,
|
||||
.bin_attrs_new = dump_fcp_bin_attrs,
|
||||
.bin_attrs = dump_fcp_bin_attrs,
|
||||
};
|
||||
|
||||
/* NVME dump device attributes */
|
||||
@@ -1630,7 +1630,7 @@ static const struct bin_attribute *const dump_nvme_bin_attrs[] = {
|
||||
static const struct attribute_group dump_nvme_attr_group = {
|
||||
.name = IPL_NVME_STR,
|
||||
.attrs = dump_nvme_attrs,
|
||||
.bin_attrs_new = dump_nvme_bin_attrs,
|
||||
.bin_attrs = dump_nvme_bin_attrs,
|
||||
};
|
||||
|
||||
/* ECKD dump device attributes */
|
||||
@@ -1664,7 +1664,7 @@ static const struct bin_attribute *const dump_eckd_bin_attrs[] = {
|
||||
static const struct attribute_group dump_eckd_attr_group = {
|
||||
.name = IPL_ECKD_STR,
|
||||
.attrs = dump_eckd_attrs,
|
||||
.bin_attrs_new = dump_eckd_bin_attrs,
|
||||
.bin_attrs = dump_eckd_bin_attrs,
|
||||
};
|
||||
|
||||
/* CCW dump device attributes */
|
||||
|
||||
@@ -218,7 +218,7 @@ static struct attribute *zpci_dev_attrs[] = {
|
||||
|
||||
const struct attribute_group zpci_attr_group = {
|
||||
.attrs = zpci_dev_attrs,
|
||||
.bin_attrs_new = zpci_bin_attrs,
|
||||
.bin_attrs = zpci_bin_attrs,
|
||||
};
|
||||
|
||||
static struct attribute *pfip_attrs[] = {
|
||||
|
||||
@@ -56,7 +56,7 @@ static const struct bin_attribute *const boot_params_data_attrs[] = {
|
||||
|
||||
static const struct attribute_group boot_params_attr_group = {
|
||||
.attrs = boot_params_version_attrs,
|
||||
.bin_attrs_new = boot_params_data_attrs,
|
||||
.bin_attrs = boot_params_data_attrs,
|
||||
};
|
||||
|
||||
static int kobj_to_setup_data_nr(struct kobject *kobj, int *nr)
|
||||
@@ -265,7 +265,7 @@ static const struct bin_attribute *const setup_data_data_attrs[] = {
|
||||
|
||||
static const struct attribute_group setup_data_attr_group = {
|
||||
.attrs = setup_data_type_attrs,
|
||||
.bin_attrs_new = setup_data_data_attrs,
|
||||
.bin_attrs = setup_data_data_attrs,
|
||||
};
|
||||
|
||||
static int __init create_setup_data_node(struct kobject *parent,
|
||||
|
||||
@@ -479,7 +479,7 @@ static const struct bin_attribute *const hl_dev_bin_attrs[] = {
|
||||
|
||||
static struct attribute_group hl_dev_attr_group = {
|
||||
.attrs = hl_dev_attrs,
|
||||
.bin_attrs_new = hl_dev_bin_attrs,
|
||||
.bin_attrs = hl_dev_bin_attrs,
|
||||
};
|
||||
|
||||
static struct attribute_group hl_dev_clks_attr_group;
|
||||
|
||||
+1
-1
@@ -47,7 +47,7 @@ static const struct bin_attribute *const bgrt_bin_attributes[] = {
|
||||
|
||||
static const struct attribute_group bgrt_attribute_group = {
|
||||
.attrs = bgrt_attributes,
|
||||
.bin_attrs_new = bgrt_bin_attributes,
|
||||
.bin_attrs = bgrt_bin_attributes,
|
||||
};
|
||||
|
||||
int __init acpi_parse_bgrt(struct acpi_table_header *table)
|
||||
|
||||
@@ -140,7 +140,7 @@ static const struct bin_attribute *const devcd_dev_bin_attrs[] = {
|
||||
};
|
||||
|
||||
static const struct attribute_group devcd_dev_group = {
|
||||
.bin_attrs_new = devcd_dev_bin_attrs,
|
||||
.bin_attrs = devcd_dev_bin_attrs,
|
||||
};
|
||||
|
||||
static const struct attribute_group *devcd_dev_groups[] = {
|
||||
|
||||
@@ -381,7 +381,7 @@ static const struct bin_attribute *const fw_dev_bin_attrs[] = {
|
||||
|
||||
static const struct attribute_group fw_dev_attr_group = {
|
||||
.attrs = fw_dev_attrs,
|
||||
.bin_attrs_new = fw_dev_bin_attrs,
|
||||
.bin_attrs = fw_dev_bin_attrs,
|
||||
#ifdef CONFIG_FW_UPLOAD
|
||||
.is_visible = fw_upload_is_visible,
|
||||
#endif
|
||||
|
||||
+1
-1
@@ -597,7 +597,7 @@ static const struct bin_attribute *node_dev_bin_attrs[] = {
|
||||
|
||||
static const struct attribute_group node_dev_group = {
|
||||
.attrs = node_dev_attrs,
|
||||
.bin_attrs_new = node_dev_bin_attrs,
|
||||
.bin_attrs = node_dev_bin_attrs,
|
||||
};
|
||||
|
||||
static const struct attribute_group *node_dev_groups[] = {
|
||||
|
||||
@@ -179,7 +179,7 @@ static umode_t topology_is_visible(struct kobject *kobj,
|
||||
|
||||
static const struct attribute_group topology_attr_group = {
|
||||
.attrs = default_attrs,
|
||||
.bin_attrs_new = bin_attrs,
|
||||
.bin_attrs = bin_attrs,
|
||||
.is_visible = topology_is_visible,
|
||||
.name = "topology"
|
||||
};
|
||||
|
||||
+1
-1
@@ -181,7 +181,7 @@ static const struct bin_attribute *const cxl_cdat_bin_attributes[] = {
|
||||
};
|
||||
|
||||
static const struct attribute_group cxl_cdat_attribute_group = {
|
||||
.bin_attrs_new = cxl_cdat_bin_attributes,
|
||||
.bin_attrs = cxl_cdat_bin_attributes,
|
||||
.is_bin_visible = cxl_port_bin_attr_is_visible,
|
||||
};
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ static const struct bin_attribute *const bin_attrs[] = {
|
||||
|
||||
static const struct attribute_group cbmem_entry_group = {
|
||||
.attrs = attrs,
|
||||
.bin_attrs_new = bin_attrs,
|
||||
.bin_attrs = bin_attrs,
|
||||
};
|
||||
|
||||
static const struct attribute_group *dev_groups[] = {
|
||||
|
||||
@@ -4181,7 +4181,7 @@ static umode_t amdgpu_bin_flash_attr_is_visible(struct kobject *kobj,
|
||||
|
||||
const struct attribute_group amdgpu_flash_attr_group = {
|
||||
.attrs = flash_attrs,
|
||||
.bin_attrs_new = bin_flash_attrs,
|
||||
.bin_attrs = bin_flash_attrs,
|
||||
.is_bin_visible = amdgpu_bin_flash_attr_is_visible,
|
||||
.is_visible = amdgpu_flash_attr_is_visible,
|
||||
};
|
||||
|
||||
@@ -2124,7 +2124,7 @@ static int amdgpu_ras_fs_init(struct amdgpu_device *adev)
|
||||
con->badpages_attr = bin_attr_gpu_vram_bad_pages;
|
||||
sysfs_bin_attr_init(&con->badpages_attr);
|
||||
bin_attrs[0] = &con->badpages_attr;
|
||||
group.bin_attrs_new = bin_attrs;
|
||||
group.bin_attrs = bin_attrs;
|
||||
}
|
||||
|
||||
r = sysfs_create_group(&adev->dev->kobj, &group);
|
||||
|
||||
@@ -329,7 +329,7 @@ static const struct bin_attribute *const connector_bin_attrs[] = {
|
||||
|
||||
static const struct attribute_group connector_dev_group = {
|
||||
.attrs = connector_dev_attrs,
|
||||
.bin_attrs_new = connector_bin_attrs,
|
||||
.bin_attrs = connector_bin_attrs,
|
||||
};
|
||||
|
||||
static const struct attribute_group *connector_dev_groups[] = {
|
||||
|
||||
@@ -2812,7 +2812,7 @@ static const struct bin_attribute *hid_dev_bin_attrs[] = {
|
||||
};
|
||||
static const struct attribute_group hid_dev_group = {
|
||||
.attrs = hid_dev_attrs,
|
||||
.bin_attrs_new = hid_dev_bin_attrs,
|
||||
.bin_attrs = hid_dev_bin_attrs,
|
||||
};
|
||||
__ATTRIBUTE_GROUPS(hid_dev);
|
||||
|
||||
|
||||
@@ -258,7 +258,7 @@ static const struct bin_attribute *const arvo_bin_attributes[] = {
|
||||
|
||||
static const struct attribute_group arvo_group = {
|
||||
.attrs = arvo_attrs,
|
||||
.bin_attrs_new = arvo_bin_attributes,
|
||||
.bin_attrs = arvo_bin_attributes,
|
||||
};
|
||||
|
||||
static const struct attribute_group *arvo_groups[] = {
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user