2
0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08: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:
Thomas Weißschuh 2025-05-30 05:54:38 +02:00 committed by Greg Kroah-Hartman
parent 2fbe82037a
commit fb506e31b3
71 changed files with 91 additions and 91 deletions

View File

@ -121,7 +121,7 @@ static struct attribute *secvar_attrs[] = {
static const struct attribute_group secvar_attr_group = { static const struct attribute_group secvar_attr_group = {
.attrs = secvar_attrs, .attrs = secvar_attrs,
.bin_attrs_new = secvar_bin_attrs, .bin_attrs = secvar_bin_attrs,
}; };
__ATTRIBUTE_GROUPS(secvar_attr); __ATTRIBUTE_GROUPS(secvar_attr);

View File

@ -1141,7 +1141,7 @@ static struct attribute *if_attrs[] = {
static const struct attribute_group if_group = { static const struct attribute_group if_group = {
.name = "interface", .name = "interface",
.bin_attrs_new = if_bin_attrs, .bin_attrs = if_bin_attrs,
.attrs = if_attrs, .attrs = if_attrs,
}; };

View File

@ -607,7 +607,7 @@ static const struct bin_attribute *const mpipl_bin_attr[] = {
static const struct attribute_group mpipl_group = { static const struct attribute_group mpipl_group = {
.attrs = mpipl_attr, .attrs = mpipl_attr,
.bin_attrs_new = mpipl_bin_attr, .bin_attrs = mpipl_bin_attr,
}; };
static int __init opalcore_init(void) static int __init opalcore_init(void)

View File

@ -101,7 +101,7 @@ static const struct bin_attribute *const cpacf_attrs[] = {
static const struct attribute_group cpacf_attr_grp = { static const struct attribute_group cpacf_attr_grp = {
.name = "cpacf", .name = "cpacf",
.bin_attrs_new = cpacf_attrs, .bin_attrs = cpacf_attrs,
}; };
static int __init cpacf_init(void) static int __init cpacf_init(void)

View File

@ -596,7 +596,7 @@ static struct attribute *ipl_fcp_attrs[] = {
static const struct attribute_group ipl_fcp_attr_group = { static const struct attribute_group ipl_fcp_attr_group = {
.attrs = ipl_fcp_attrs, .attrs = ipl_fcp_attrs,
.bin_attrs_new = ipl_fcp_bin_attrs, .bin_attrs = ipl_fcp_bin_attrs,
}; };
static struct attribute *ipl_nvme_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 = { static const struct attribute_group ipl_nvme_attr_group = {
.attrs = ipl_nvme_attrs, .attrs = ipl_nvme_attrs,
.bin_attrs_new = ipl_nvme_bin_attrs, .bin_attrs = ipl_nvme_bin_attrs,
}; };
static struct attribute *ipl_eckd_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 = { static const struct attribute_group ipl_eckd_attr_group = {
.attrs = ipl_eckd_attrs, .attrs = ipl_eckd_attrs,
.bin_attrs_new = ipl_eckd_bin_attrs, .bin_attrs = ipl_eckd_bin_attrs,
}; };
/* CCW ipl device attributes */ /* CCW ipl device attributes */
@ -920,7 +920,7 @@ static struct attribute *reipl_fcp_attrs[] = {
static const struct attribute_group reipl_fcp_attr_group = { static const struct attribute_group reipl_fcp_attr_group = {
.attrs = reipl_fcp_attrs, .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 = 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 = { static const struct attribute_group reipl_nvme_attr_group = {
.attrs = reipl_nvme_attrs, .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, 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 = { static const struct attribute_group reipl_eckd_attr_group = {
.attrs = reipl_eckd_attrs, .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, 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 = { static const struct attribute_group dump_fcp_attr_group = {
.name = IPL_FCP_STR, .name = IPL_FCP_STR,
.attrs = dump_fcp_attrs, .attrs = dump_fcp_attrs,
.bin_attrs_new = dump_fcp_bin_attrs, .bin_attrs = dump_fcp_bin_attrs,
}; };
/* NVME dump device attributes */ /* 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 = { static const struct attribute_group dump_nvme_attr_group = {
.name = IPL_NVME_STR, .name = IPL_NVME_STR,
.attrs = dump_nvme_attrs, .attrs = dump_nvme_attrs,
.bin_attrs_new = dump_nvme_bin_attrs, .bin_attrs = dump_nvme_bin_attrs,
}; };
/* ECKD dump device attributes */ /* 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 = { static const struct attribute_group dump_eckd_attr_group = {
.name = IPL_ECKD_STR, .name = IPL_ECKD_STR,
.attrs = dump_eckd_attrs, .attrs = dump_eckd_attrs,
.bin_attrs_new = dump_eckd_bin_attrs, .bin_attrs = dump_eckd_bin_attrs,
}; };
/* CCW dump device attributes */ /* CCW dump device attributes */

View File

@ -218,7 +218,7 @@ static struct attribute *zpci_dev_attrs[] = {
const struct attribute_group zpci_attr_group = { const struct attribute_group zpci_attr_group = {
.attrs = zpci_dev_attrs, .attrs = zpci_dev_attrs,
.bin_attrs_new = zpci_bin_attrs, .bin_attrs = zpci_bin_attrs,
}; };
static struct attribute *pfip_attrs[] = { static struct attribute *pfip_attrs[] = {

View File

@ -56,7 +56,7 @@ static const struct bin_attribute *const boot_params_data_attrs[] = {
static const 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_new = boot_params_data_attrs, .bin_attrs = boot_params_data_attrs,
}; };
static int kobj_to_setup_data_nr(struct kobject *kobj, int *nr) 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 = { static const struct attribute_group setup_data_attr_group = {
.attrs = setup_data_type_attrs, .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, static int __init create_setup_data_node(struct kobject *parent,

View File

@ -479,7 +479,7 @@ static const struct bin_attribute *const hl_dev_bin_attrs[] = {
static struct attribute_group hl_dev_attr_group = { static struct attribute_group hl_dev_attr_group = {
.attrs = hl_dev_attrs, .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; static struct attribute_group hl_dev_clks_attr_group;

View File

@ -47,7 +47,7 @@ static const struct bin_attribute *const bgrt_bin_attributes[] = {
static const struct attribute_group bgrt_attribute_group = { static const struct attribute_group bgrt_attribute_group = {
.attrs = bgrt_attributes, .attrs = bgrt_attributes,
.bin_attrs_new = bgrt_bin_attributes, .bin_attrs = bgrt_bin_attributes,
}; };
int __init acpi_parse_bgrt(struct acpi_table_header *table) int __init acpi_parse_bgrt(struct acpi_table_header *table)

View File

@ -140,7 +140,7 @@ static const struct bin_attribute *const devcd_dev_bin_attrs[] = {
}; };
static const struct attribute_group devcd_dev_group = { 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[] = { static const struct attribute_group *devcd_dev_groups[] = {

View File

@ -381,7 +381,7 @@ static const struct bin_attribute *const fw_dev_bin_attrs[] = {
static const struct attribute_group fw_dev_attr_group = { static const struct attribute_group fw_dev_attr_group = {
.attrs = fw_dev_attrs, .attrs = fw_dev_attrs,
.bin_attrs_new = fw_dev_bin_attrs, .bin_attrs = fw_dev_bin_attrs,
#ifdef CONFIG_FW_UPLOAD #ifdef CONFIG_FW_UPLOAD
.is_visible = fw_upload_is_visible, .is_visible = fw_upload_is_visible,
#endif #endif

View File

@ -597,7 +597,7 @@ static const struct bin_attribute *node_dev_bin_attrs[] = {
static const struct attribute_group node_dev_group = { static const struct attribute_group node_dev_group = {
.attrs = node_dev_attrs, .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[] = { static const struct attribute_group *node_dev_groups[] = {

View File

@ -179,7 +179,7 @@ static umode_t topology_is_visible(struct kobject *kobj,
static const struct attribute_group topology_attr_group = { static const struct attribute_group topology_attr_group = {
.attrs = default_attrs, .attrs = default_attrs,
.bin_attrs_new = bin_attrs, .bin_attrs = bin_attrs,
.is_visible = topology_is_visible, .is_visible = topology_is_visible,
.name = "topology" .name = "topology"
}; };

View File

@ -181,7 +181,7 @@ static const struct bin_attribute *const cxl_cdat_bin_attributes[] = {
}; };
static const struct attribute_group cxl_cdat_attribute_group = { 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, .is_bin_visible = cxl_port_bin_attr_is_visible,
}; };

View File

@ -86,7 +86,7 @@ static const struct bin_attribute *const bin_attrs[] = {
static const struct attribute_group cbmem_entry_group = { static const struct attribute_group cbmem_entry_group = {
.attrs = attrs, .attrs = attrs,
.bin_attrs_new = bin_attrs, .bin_attrs = bin_attrs,
}; };
static const struct attribute_group *dev_groups[] = { static const struct attribute_group *dev_groups[] = {

View File

@ -4181,7 +4181,7 @@ static umode_t amdgpu_bin_flash_attr_is_visible(struct kobject *kobj,
const struct attribute_group amdgpu_flash_attr_group = { const struct attribute_group amdgpu_flash_attr_group = {
.attrs = flash_attrs, .attrs = flash_attrs,
.bin_attrs_new = bin_flash_attrs, .bin_attrs = bin_flash_attrs,
.is_bin_visible = amdgpu_bin_flash_attr_is_visible, .is_bin_visible = amdgpu_bin_flash_attr_is_visible,
.is_visible = amdgpu_flash_attr_is_visible, .is_visible = amdgpu_flash_attr_is_visible,
}; };

View File

@ -2124,7 +2124,7 @@ static int amdgpu_ras_fs_init(struct amdgpu_device *adev)
con->badpages_attr = bin_attr_gpu_vram_bad_pages; con->badpages_attr = bin_attr_gpu_vram_bad_pages;
sysfs_bin_attr_init(&con->badpages_attr); sysfs_bin_attr_init(&con->badpages_attr);
bin_attrs[0] = &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); r = sysfs_create_group(&adev->dev->kobj, &group);

View File

@ -329,7 +329,7 @@ static const struct bin_attribute *const connector_bin_attrs[] = {
static const struct attribute_group connector_dev_group = { static const struct attribute_group connector_dev_group = {
.attrs = connector_dev_attrs, .attrs = connector_dev_attrs,
.bin_attrs_new = connector_bin_attrs, .bin_attrs = connector_bin_attrs,
}; };
static const struct attribute_group *connector_dev_groups[] = { static const struct attribute_group *connector_dev_groups[] = {

View File

@ -2812,7 +2812,7 @@ static const struct bin_attribute *hid_dev_bin_attrs[] = {
}; };
static const struct attribute_group hid_dev_group = { static const struct attribute_group hid_dev_group = {
.attrs = hid_dev_attrs, .attrs = hid_dev_attrs,
.bin_attrs_new = hid_dev_bin_attrs, .bin_attrs = hid_dev_bin_attrs,
}; };
__ATTRIBUTE_GROUPS(hid_dev); __ATTRIBUTE_GROUPS(hid_dev);

View File

@ -258,7 +258,7 @@ static const struct bin_attribute *const arvo_bin_attributes[] = {
static const struct attribute_group arvo_group = { static const struct attribute_group arvo_group = {
.attrs = arvo_attrs, .attrs = arvo_attrs,
.bin_attrs_new = arvo_bin_attributes, .bin_attrs = arvo_bin_attributes,
}; };
static const struct attribute_group *arvo_groups[] = { static const struct attribute_group *arvo_groups[] = {

View File

@ -238,7 +238,7 @@ static const struct bin_attribute *const isku_bin_attributes[] = {
static const struct attribute_group isku_group = { static const struct attribute_group isku_group = {
.attrs = isku_attrs, .attrs = isku_attrs,
.bin_attrs_new = isku_bin_attributes, .bin_attrs = isku_bin_attributes,
}; };
static const struct attribute_group *isku_groups[] = { static const struct attribute_group *isku_groups[] = {

View File

@ -646,7 +646,7 @@ static const struct bin_attribute *const kone_bin_attributes[] = {
static const struct attribute_group kone_group = { static const struct attribute_group kone_group = {
.attrs = kone_attrs, .attrs = kone_attrs,
.bin_attrs_new = kone_bin_attributes, .bin_attrs = kone_bin_attributes,
}; };
static const struct attribute_group *kone_groups[] = { static const struct attribute_group *kone_groups[] = {

View File

@ -346,7 +346,7 @@ static const struct bin_attribute *const koneplus_bin_attributes[] = {
static const struct attribute_group koneplus_group = { static const struct attribute_group koneplus_group = {
.attrs = koneplus_attrs, .attrs = koneplus_attrs,
.bin_attrs_new = koneplus_bin_attributes, .bin_attrs = koneplus_bin_attributes,
}; };
static const struct attribute_group *koneplus_groups[] = { static const struct attribute_group *koneplus_groups[] = {

View File

@ -62,7 +62,7 @@ static const struct bin_attribute *const konepure_bin_attrs[] = {
}; };
static const struct attribute_group konepure_group = { static const struct attribute_group konepure_group = {
.bin_attrs_new = konepure_bin_attrs, .bin_attrs = konepure_bin_attrs,
}; };
static const struct attribute_group *konepure_groups[] = { static const struct attribute_group *konepure_groups[] = {

View File

@ -399,7 +399,7 @@ static const struct bin_attribute *const kovaplus_bin_attributes[] = {
static const struct attribute_group kovaplus_group = { static const struct attribute_group kovaplus_group = {
.attrs = kovaplus_attrs, .attrs = kovaplus_attrs,
.bin_attrs_new = kovaplus_bin_attributes, .bin_attrs = kovaplus_bin_attributes,
}; };
static const struct attribute_group *kovaplus_groups[] = { static const struct attribute_group *kovaplus_groups[] = {

View File

@ -355,7 +355,7 @@ static const struct bin_attribute *const pyra_bin_attributes[] = {
static const struct attribute_group pyra_group = { static const struct attribute_group pyra_group = {
.attrs = pyra_attrs, .attrs = pyra_attrs,
.bin_attrs_new = pyra_bin_attributes, .bin_attrs = pyra_bin_attributes,
}; };
static const struct attribute_group *pyra_groups[] = { static const struct attribute_group *pyra_groups[] = {

View File

@ -70,7 +70,7 @@ static const struct bin_attribute *const ryos_bin_attrs[] = {
}; };
static const struct attribute_group ryos_group = { static const struct attribute_group ryos_group = {
.bin_attrs_new = ryos_bin_attrs, .bin_attrs = ryos_bin_attrs,
}; };
static const struct attribute_group *ryos_groups[] = { static const struct attribute_group *ryos_groups[] = {

View File

@ -42,7 +42,7 @@ static const struct bin_attribute *const savu_bin_attrs[] = {
}; };
static const struct attribute_group savu_group = { static const struct attribute_group savu_group = {
.bin_attrs_new = savu_bin_attrs, .bin_attrs = savu_bin_attrs,
}; };
static const struct attribute_group *savu_groups[] = { static const struct attribute_group *savu_groups[] = {

View File

@ -1357,7 +1357,7 @@ static const struct bin_attribute *const bno055_bin_attrs[] = {
static const struct attribute_group bno055_attrs_group = { static const struct attribute_group bno055_attrs_group = {
.attrs = bno055_attrs, .attrs = bno055_attrs,
.bin_attrs_new = bno055_bin_attrs, .bin_attrs = bno055_bin_attrs,
}; };
static const struct iio_info bno055_info = { static const struct iio_info bno055_info = {

View File

@ -134,7 +134,7 @@ static struct attribute *port_cc_attributes[] = {
static const struct attribute_group port_cc_group = { static const struct attribute_group port_cc_group = {
.name = "CCMgtA", .name = "CCMgtA",
.attrs = port_cc_attributes, .attrs = port_cc_attributes,
.bin_attrs_new = port_cc_bin_attributes, .bin_attrs = port_cc_bin_attributes,
}; };
/* Start sc2vl */ /* Start sc2vl */

View File

@ -295,7 +295,7 @@ static umode_t qib_ccmgta_is_bin_visible(struct kobject *kobj,
static const struct attribute_group port_ccmgta_attribute_group = { static const struct attribute_group port_ccmgta_attribute_group = {
.name = "CCMgtA", .name = "CCMgtA",
.is_bin_visible = qib_ccmgta_is_bin_visible, .is_bin_visible = qib_ccmgta_is_bin_visible,
.bin_attrs_new = port_ccmgta_attributes, .bin_attrs = port_ccmgta_attributes,
}; };
/* Start sl2vl */ /* Start sl2vl */

View File

@ -707,7 +707,7 @@ static const struct bin_attribute *const goodix_berlin_bin_attrs[] = {
}; };
static const struct attribute_group goodix_berlin_attr_group = { static const struct attribute_group goodix_berlin_attr_group = {
.bin_attrs_new = goodix_berlin_bin_attrs, .bin_attrs = goodix_berlin_bin_attrs,
}; };
const struct attribute_group *goodix_berlin_groups[] = { const struct attribute_group *goodix_berlin_groups[] = {

View File

@ -91,7 +91,7 @@ static const struct bin_attribute *const led_trigger_bin_attrs[] = {
NULL, NULL,
}; };
static const struct attribute_group led_trigger_group = { static const struct attribute_group led_trigger_group = {
.bin_attrs_new = led_trigger_bin_attrs, .bin_attrs = led_trigger_bin_attrs,
}; };
#endif #endif

View File

@ -888,7 +888,7 @@ static size_t c2port_bin_attr_size(struct kobject *kobj,
static const struct attribute_group c2port_group = { static const struct attribute_group c2port_group = {
.attrs = c2port_attrs, .attrs = c2port_attrs,
.bin_attrs_new = c2port_bin_attrs, .bin_attrs = c2port_bin_attrs,
.bin_size = c2port_bin_attr_size, .bin_size = c2port_bin_attr_size,
}; };

View File

@ -104,7 +104,7 @@ static const struct attribute_group spi_nor_sysfs_group = {
.is_visible = spi_nor_sysfs_is_visible, .is_visible = spi_nor_sysfs_is_visible,
.is_bin_visible = spi_nor_sysfs_is_bin_visible, .is_bin_visible = spi_nor_sysfs_is_bin_visible,
.attrs = spi_nor_sysfs_entries, .attrs = spi_nor_sysfs_entries,
.bin_attrs_new = spi_nor_sysfs_bin_entries, .bin_attrs = spi_nor_sysfs_bin_entries,
}; };
const struct attribute_group *spi_nor_sysfs_groups[] = { const struct attribute_group *spi_nor_sysfs_groups[] = {

View File

@ -386,7 +386,7 @@ static const struct bin_attribute *const nvmem_bin_attributes[] = {
}; };
static const struct attribute_group nvmem_bin_group = { static const struct attribute_group nvmem_bin_group = {
.bin_attrs_new = nvmem_bin_attributes, .bin_attrs = nvmem_bin_attributes,
.attrs = nvmem_attrs, .attrs = nvmem_attrs,
.is_bin_visible = nvmem_bin_attr_is_visible, .is_bin_visible = nvmem_bin_attr_is_visible,
.bin_size = nvmem_bin_attr_size, .bin_size = nvmem_bin_attr_size,
@ -503,7 +503,7 @@ static int nvmem_populate_sysfs_cells(struct nvmem_device *nvmem)
i++; i++;
} }
group.bin_attrs_new = pattrs; group.bin_attrs = pattrs;
ret = device_add_group(&nvmem->dev, &group); ret = device_add_group(&nvmem->dev, &group);
if (ret) if (ret)

View File

@ -196,7 +196,7 @@ static const struct bin_attribute *const p2pmem_bin_attrs[] = {
static const struct attribute_group p2pmem_group = { static const struct attribute_group p2pmem_group = {
.attrs = p2pmem_attrs, .attrs = p2pmem_attrs,
.bin_attrs_new = p2pmem_bin_attrs, .bin_attrs = p2pmem_bin_attrs,
.name = "p2pmem", .name = "p2pmem",
}; };

View File

@ -857,7 +857,7 @@ static size_t pci_dev_config_attr_bin_size(struct kobject *kobj,
} }
static const struct attribute_group pci_dev_config_attr_group = { static const struct attribute_group pci_dev_config_attr_group = {
.bin_attrs_new = pci_dev_config_attrs, .bin_attrs = pci_dev_config_attrs,
.bin_size = pci_dev_config_attr_bin_size, .bin_size = pci_dev_config_attr_bin_size,
}; };
@ -1377,7 +1377,7 @@ static size_t pci_dev_rom_attr_bin_size(struct kobject *kobj,
} }
static const struct attribute_group pci_dev_rom_attr_group = { static const struct attribute_group pci_dev_rom_attr_group = {
.bin_attrs_new = pci_dev_rom_attrs, .bin_attrs = pci_dev_rom_attrs,
.is_bin_visible = pci_dev_rom_attr_is_visible, .is_bin_visible = pci_dev_rom_attr_is_visible,
.bin_size = pci_dev_rom_attr_bin_size, .bin_size = pci_dev_rom_attr_bin_size,
}; };

View File

@ -336,7 +336,7 @@ static umode_t vpd_attr_is_visible(struct kobject *kobj,
} }
const struct attribute_group pci_dev_vpd_attr_group = { const struct attribute_group pci_dev_vpd_attr_group = {
.bin_attrs_new = vpd_attrs, .bin_attrs = vpd_attrs,
.is_bin_visible = vpd_attr_is_visible, .is_bin_visible = vpd_attr_is_visible,
}; };

View File

@ -108,7 +108,7 @@ static const struct bin_attribute *const cros_ec_vbc_bin_attrs[] = {
static const struct attribute_group cros_ec_vbc_attr_group = { static const struct attribute_group cros_ec_vbc_attr_group = {
.name = "vbc", .name = "vbc",
.bin_attrs_new = cros_ec_vbc_bin_attrs, .bin_attrs = cros_ec_vbc_bin_attrs,
}; };
static int cros_ec_vbc_probe(struct platform_device *pd) static int cros_ec_vbc_probe(struct platform_device *pd)

View File

@ -560,7 +560,7 @@ static struct attribute *hsmp_dev_attr_list[] = {
}; };
static const struct attribute_group hsmp_attr_grp = { static const struct attribute_group hsmp_attr_grp = {
.bin_attrs_new = hsmp_attr_list, .bin_attrs = hsmp_attr_list,
.attrs = hsmp_dev_attr_list, .attrs = hsmp_dev_attr_list,
.is_bin_visible = hsmp_is_sock_attr_visible, .is_bin_visible = hsmp_is_sock_attr_visible,
.is_visible = hsmp_is_sock_dev_attr_visible, .is_visible = hsmp_is_sock_dev_attr_visible,

View File

@ -110,7 +110,7 @@ HSMP_BIN_ATTR(7, *sock7_attr_list);
#define HSMP_BIN_ATTR_GRP(index, _list, _name) \ #define HSMP_BIN_ATTR_GRP(index, _list, _name) \
static const struct attribute_group sock##index##_attr_grp = { \ static const struct attribute_group sock##index##_attr_grp = { \
.bin_attrs_new = _list, \ .bin_attrs = _list, \
.is_bin_visible = hsmp_is_sock_attr_visible, \ .is_bin_visible = hsmp_is_sock_attr_visible, \
.name = #_name, \ .name = #_name, \
} }

View File

@ -662,7 +662,7 @@ static struct attribute *dcdbas_dev_attrs[] = {
static const struct attribute_group dcdbas_attr_group = { static const struct attribute_group dcdbas_attr_group = {
.attrs = dcdbas_dev_attrs, .attrs = dcdbas_dev_attrs,
.bin_attrs_new = dcdbas_bin_attrs, .bin_attrs = dcdbas_bin_attrs,
}; };
static int dcdbas_probe(struct platform_device *dev) static int dcdbas_probe(struct platform_device *dev)

View File

@ -636,7 +636,7 @@ static const struct bin_attribute *const rbu_bin_attrs[] = {
}; };
static const struct attribute_group rbu_group = { static const struct attribute_group rbu_group = {
.bin_attrs_new = rbu_bin_attrs, .bin_attrs = rbu_bin_attrs,
}; };
static int __init dcdrbu_init(void) static int __init dcdrbu_init(void)

View File

@ -576,7 +576,7 @@ static struct attribute *sdsi_attrs[] = {
static const struct attribute_group sdsi_group = { static const struct attribute_group sdsi_group = {
.attrs = sdsi_attrs, .attrs = sdsi_attrs,
.bin_attrs_new = sdsi_bin_attrs, .bin_attrs = sdsi_bin_attrs,
.is_bin_visible = sdsi_battr_is_visible, .is_bin_visible = sdsi_battr_is_visible,
}; };
__ATTRIBUTE_GROUPS(sdsi); __ATTRIBUTE_GROUPS(sdsi);

View File

@ -46,7 +46,7 @@ static size_t bmof_bin_size(struct kobject *kobj, const struct bin_attribute *at
static const struct attribute_group bmof_group = { static const struct attribute_group bmof_group = {
.bin_size = bmof_bin_size, .bin_size = bmof_bin_size,
.bin_attrs_new = bmof_attrs, .bin_attrs = bmof_attrs,
}; };
static const struct attribute_group *bmof_groups[] = { static const struct attribute_group *bmof_groups[] = {

View File

@ -209,7 +209,7 @@ static const struct bin_attribute *const w1_ds2760_bin_attrs[] = {
}; };
static const struct attribute_group w1_ds2760_group = { static const struct attribute_group w1_ds2760_group = {
.bin_attrs_new = w1_ds2760_bin_attrs, .bin_attrs = w1_ds2760_bin_attrs,
}; };
static const struct attribute_group *w1_ds2760_groups[] = { static const struct attribute_group *w1_ds2760_groups[] = {

View File

@ -734,7 +734,7 @@ static const struct bin_attribute *const ds2780_sysfs_bin_attrs[] = {
static const struct attribute_group ds2780_sysfs_group = { static const struct attribute_group ds2780_sysfs_group = {
.attrs = ds2780_sysfs_attrs, .attrs = ds2780_sysfs_attrs,
.bin_attrs_new = ds2780_sysfs_bin_attrs, .bin_attrs = ds2780_sysfs_bin_attrs,
}; };
static const struct attribute_group *ds2780_sysfs_groups[] = { static const struct attribute_group *ds2780_sysfs_groups[] = {

View File

@ -737,7 +737,7 @@ static const struct bin_attribute *const ds2781_sysfs_bin_attrs[] = {
static const struct attribute_group ds2781_sysfs_group = { static const struct attribute_group ds2781_sysfs_group = {
.attrs = ds2781_sysfs_attrs, .attrs = ds2781_sysfs_attrs,
.bin_attrs_new = ds2781_sysfs_bin_attrs, .bin_attrs = ds2781_sysfs_bin_attrs,
}; };

View File

@ -591,7 +591,7 @@ static const struct bin_attribute *const olpc_bat_sysfs_bin_attrs[] = {
static const struct attribute_group olpc_bat_sysfs_group = { static const struct attribute_group olpc_bat_sysfs_group = {
.attrs = olpc_bat_sysfs_attrs, .attrs = olpc_bat_sysfs_attrs,
.bin_attrs_new = olpc_bat_sysfs_bin_attrs, .bin_attrs = olpc_bat_sysfs_bin_attrs,
}; };
static const struct attribute_group *olpc_bat_sysfs_groups[] = { static const struct attribute_group *olpc_bat_sysfs_groups[] = {

View File

@ -3938,7 +3938,7 @@ static const struct bin_attribute *const bin_art_timecard_attrs[] = {
static const struct attribute_group art_timecard_group = { static const struct attribute_group art_timecard_group = {
.attrs = art_timecard_attrs, .attrs = art_timecard_attrs,
.bin_attrs_new = bin_art_timecard_attrs, .bin_attrs = bin_art_timecard_attrs,
}; };
static const struct ocp_attr_group art_timecard_groups[] = { static const struct ocp_attr_group art_timecard_groups[] = {

View File

@ -278,7 +278,7 @@ static umode_t rio_dev_is_attr_visible(struct kobject *kobj,
static const struct attribute_group rio_dev_group = { static const struct attribute_group rio_dev_group = {
.attrs = rio_dev_attrs, .attrs = rio_dev_attrs,
.is_visible = rio_dev_is_attr_visible, .is_visible = rio_dev_is_attr_visible,
.bin_attrs_new = rio_dev_bin_attrs, .bin_attrs = rio_dev_bin_attrs,
}; };
const struct attribute_group *rio_dev_groups[] = { const struct attribute_group *rio_dev_groups[] = {

View File

@ -470,7 +470,7 @@ static struct attribute *chp_attrs[] = {
}; };
static const struct attribute_group chp_attr_group = { static const struct attribute_group chp_attr_group = {
.attrs = chp_attrs, .attrs = chp_attrs,
.bin_attrs_new = chp_bin_attrs, .bin_attrs = chp_bin_attrs,
}; };
static const struct attribute_group *chp_attr_groups[] = { static const struct attribute_group *chp_attr_groups[] = {
&chp_attr_group, &chp_attr_group,

View File

@ -297,7 +297,7 @@ static const struct bin_attribute *const protkey_attrs[] = {
static const struct attribute_group protkey_attr_group = { static const struct attribute_group protkey_attr_group = {
.name = "protkey", .name = "protkey",
.bin_attrs_new = protkey_attrs, .bin_attrs = protkey_attrs,
}; };
/* /*
@ -406,7 +406,7 @@ static const struct bin_attribute *const ccadata_attrs[] = {
static const struct attribute_group ccadata_attr_group = { static const struct attribute_group ccadata_attr_group = {
.name = "ccadata", .name = "ccadata",
.bin_attrs_new = ccadata_attrs, .bin_attrs = ccadata_attrs,
}; };
#define CCACIPHERTOKENSIZE (sizeof(struct cipherkeytoken) + 80) #define CCACIPHERTOKENSIZE (sizeof(struct cipherkeytoken) + 80)
@ -520,7 +520,7 @@ static const struct bin_attribute *const ccacipher_attrs[] = {
static const struct attribute_group ccacipher_attr_group = { static const struct attribute_group ccacipher_attr_group = {
.name = "ccacipher", .name = "ccacipher",
.bin_attrs_new = ccacipher_attrs, .bin_attrs = ccacipher_attrs,
}; };
/* /*
@ -635,7 +635,7 @@ static const struct bin_attribute *const ep11_attrs[] = {
static const struct attribute_group ep11_attr_group = { static const struct attribute_group ep11_attr_group = {
.name = "ep11", .name = "ep11",
.bin_attrs_new = ep11_attrs, .bin_attrs = ep11_attrs,
}; };
const struct attribute_group *pkey_attr_groups[] = { const struct attribute_group *pkey_attr_groups[] = {

View File

@ -1362,7 +1362,7 @@ static const struct bin_attribute *const scsi_sdev_bin_attrs[] = {
}; };
static struct attribute_group scsi_sdev_attr_group = { static struct attribute_group scsi_sdev_attr_group = {
.attrs = scsi_sdev_attrs, .attrs = scsi_sdev_attrs,
.bin_attrs_new = scsi_sdev_bin_attrs, .bin_attrs = scsi_sdev_bin_attrs,
.is_visible = scsi_sdev_attr_is_visible, .is_visible = scsi_sdev_attr_is_visible,
.is_bin_visible = scsi_sdev_bin_attr_is_visible, .is_bin_visible = scsi_sdev_bin_attr_is_visible,
}; };

View File

@ -944,7 +944,7 @@ static umode_t dev_bin_attrs_are_visible(struct kobject *kobj,
} }
static const struct attribute_group dev_bin_attr_grp = { static const struct attribute_group dev_bin_attr_grp = {
.bin_attrs_new = dev_bin_attrs, .bin_attrs = dev_bin_attrs,
.is_bin_visible = dev_bin_attrs_are_visible, .is_bin_visible = dev_bin_attrs_are_visible,
}; };

View File

@ -259,7 +259,7 @@ static const struct bin_attribute *const dev_bin_attrs[] = {
static const struct attribute_group vudc_attr_group = { static const struct attribute_group vudc_attr_group = {
.attrs = dev_attrs, .attrs = dev_attrs,
.bin_attrs_new = dev_bin_attrs, .bin_attrs = dev_bin_attrs,
}; };
const struct attribute_group *vudc_groups[] = { const struct attribute_group *vudc_groups[] = {

View File

@ -228,7 +228,7 @@ tsm_mr_create_attribute_group(const struct tsm_measurements *tm)
init_rwsem(&ctx->rwsem); init_rwsem(&ctx->rwsem);
ctx->agrp.name = "measurements"; ctx->agrp.name = "measurements";
ctx->agrp.bin_attrs_new = no_free_ptr(attrs); ctx->agrp.bin_attrs = no_free_ptr(attrs);
ctx->tm = tm; ctx->tm = tm;
return &no_free_ptr(ctx)->agrp; return &no_free_ptr(ctx)->agrp;
} }
@ -244,7 +244,7 @@ EXPORT_SYMBOL_GPL(tsm_mr_create_attribute_group);
void tsm_mr_free_attribute_group(const struct attribute_group *attr_grp) void tsm_mr_free_attribute_group(const struct attribute_group *attr_grp)
{ {
if (!IS_ERR_OR_NULL(attr_grp)) { if (!IS_ERR_OR_NULL(attr_grp)) {
kfree(attr_grp->bin_attrs_new); kfree(attr_grp->bin_attrs);
kfree(container_of(attr_grp, struct tm_context, agrp)); kfree(container_of(attr_grp, struct tm_context, agrp));
} }
} }

View File

@ -328,7 +328,7 @@ static const struct bin_attribute *const w1_f29_bin_attrs[] = {
}; };
static const struct attribute_group w1_f29_group = { static const struct attribute_group w1_f29_group = {
.bin_attrs_new = w1_f29_bin_attrs, .bin_attrs = w1_f29_bin_attrs,
}; };
static const struct attribute_group *w1_f29_groups[] = { static const struct attribute_group *w1_f29_groups[] = {

View File

@ -137,7 +137,7 @@ static const struct bin_attribute *const w1_f3a_bin_attrs[] = {
}; };
static const struct attribute_group w1_f3a_group = { static const struct attribute_group w1_f3a_group = {
.bin_attrs_new = w1_f3a_bin_attrs, .bin_attrs = w1_f3a_bin_attrs,
}; };
static const struct attribute_group *w1_f3a_groups[] = { static const struct attribute_group *w1_f3a_groups[] = {

View File

@ -271,7 +271,7 @@ static const struct bin_attribute *const w1_f14_bin_attrs[] = {
}; };
static const struct attribute_group w1_f14_group = { static const struct attribute_group w1_f14_group = {
.bin_attrs_new = w1_f14_bin_attrs, .bin_attrs = w1_f14_bin_attrs,
}; };
static const struct attribute_group *w1_f14_groups[] = { static const struct attribute_group *w1_f14_groups[] = {

View File

@ -270,7 +270,7 @@ static const struct bin_attribute *const w1_f2d_bin_attrs[] = {
}; };
static const struct attribute_group w1_f2d_group = { static const struct attribute_group w1_f2d_group = {
.bin_attrs_new = w1_f2d_bin_attrs, .bin_attrs = w1_f2d_bin_attrs,
}; };
static const struct attribute_group *w1_f2d_groups[] = { static const struct attribute_group *w1_f2d_groups[] = {

View File

@ -294,7 +294,7 @@ static const struct bin_attribute *const w1_f23_bin_attributes[] = {
}; };
static const struct attribute_group w1_f23_group = { static const struct attribute_group w1_f23_group = {
.bin_attrs_new = w1_f23_bin_attributes, .bin_attrs = w1_f23_bin_attributes,
}; };
static const struct attribute_group *w1_f23_groups[] = { static const struct attribute_group *w1_f23_groups[] = {
@ -308,7 +308,7 @@ static const struct bin_attribute *const w1_f43_bin_attributes[] = {
}; };
static const struct attribute_group w1_f43_group = { static const struct attribute_group w1_f43_group = {
.bin_attrs_new = w1_f43_bin_attributes, .bin_attrs = w1_f43_bin_attributes,
}; };
static const struct attribute_group *w1_f43_groups[] = { static const struct attribute_group *w1_f43_groups[] = {

View File

@ -492,7 +492,7 @@ static const struct bin_attribute *const w1_ds2438_bin_attrs[] = {
}; };
static const struct attribute_group w1_ds2438_group = { static const struct attribute_group w1_ds2438_group = {
.bin_attrs_new = w1_ds2438_bin_attrs, .bin_attrs = w1_ds2438_bin_attrs,
}; };
static const struct attribute_group *w1_ds2438_groups[] = { static const struct attribute_group *w1_ds2438_groups[] = {

View File

@ -103,7 +103,7 @@ static const struct bin_attribute *const w1_ds2780_bin_attrs[] = {
}; };
static const struct attribute_group w1_ds2780_group = { static const struct attribute_group w1_ds2780_group = {
.bin_attrs_new = w1_ds2780_bin_attrs, .bin_attrs = w1_ds2780_bin_attrs,
}; };
static const struct attribute_group *w1_ds2780_groups[] = { static const struct attribute_group *w1_ds2780_groups[] = {

View File

@ -100,7 +100,7 @@ static const struct bin_attribute *const w1_ds2781_bin_attrs[] = {
}; };
static const struct attribute_group w1_ds2781_group = { static const struct attribute_group w1_ds2781_group = {
.bin_attrs_new = w1_ds2781_bin_attrs, .bin_attrs = w1_ds2781_bin_attrs,
}; };
static const struct attribute_group *w1_ds2781_groups[] = { static const struct attribute_group *w1_ds2781_groups[] = {

View File

@ -371,7 +371,7 @@ static const struct bin_attribute *const w1_f1C_bin_attrs[] = {
static const struct attribute_group w1_f1C_group = { static const struct attribute_group w1_f1C_group = {
.attrs = w1_f1C_attrs, .attrs = w1_f1C_attrs,
.bin_attrs_new = w1_f1C_bin_attrs, .bin_attrs = w1_f1C_bin_attrs,
}; };
static const struct attribute_group *w1_f1C_groups[] = { static const struct attribute_group *w1_f1C_groups[] = {

View File

@ -149,7 +149,7 @@ static const struct bin_attribute *const w1_slave_bin_attrs[] = {
}; };
static const struct attribute_group w1_slave_default_group = { static const struct attribute_group w1_slave_default_group = {
.bin_attrs_new = w1_slave_bin_attrs, .bin_attrs = w1_slave_bin_attrs,
}; };
static const struct attribute_group *w1_slave_default_groups[] = { static const struct attribute_group *w1_slave_default_groups[] = {

View File

@ -114,7 +114,7 @@ static const struct bin_attribute *const zorro_device_bin_attrs[] = {
static const struct attribute_group zorro_device_attr_group = { static const struct attribute_group zorro_device_attr_group = {
.attrs = zorro_device_attrs, .attrs = zorro_device_attrs,
.bin_attrs_new = zorro_device_bin_attrs, .bin_attrs = zorro_device_bin_attrs,
}; };
const struct attribute_group *zorro_device_attribute_groups[] = { const struct attribute_group *zorro_device_attribute_groups[] = {

View File

@ -56,9 +56,9 @@ static void free_sect_attrs(struct module_sect_attrs *sect_attrs)
{ {
const struct bin_attribute *const *bin_attr; const struct bin_attribute *const *bin_attr;
for (bin_attr = sect_attrs->grp.bin_attrs_new; *bin_attr; bin_attr++) for (bin_attr = sect_attrs->grp.bin_attrs; *bin_attr; bin_attr++)
kfree((*bin_attr)->attr.name); kfree((*bin_attr)->attr.name);
kfree(sect_attrs->grp.bin_attrs_new); kfree(sect_attrs->grp.bin_attrs);
kfree(sect_attrs); kfree(sect_attrs);
} }
@ -86,7 +86,7 @@ static int add_sect_attrs(struct module *mod, const struct load_info *info)
/* Setup section attributes. */ /* Setup section attributes. */
sect_attrs->grp.name = "sections"; sect_attrs->grp.name = "sections";
sect_attrs->grp.bin_attrs_new = gattr; sect_attrs->grp.bin_attrs = gattr;
sattr = &sect_attrs->attrs[0]; sattr = &sect_attrs->attrs[0];
for (i = 0; i < info->hdr->e_shnum; i++) { for (i = 0; i < info->hdr->e_shnum; i++) {
@ -144,7 +144,7 @@ struct module_notes_attrs {
static void free_notes_attrs(struct module_notes_attrs *notes_attrs) static void free_notes_attrs(struct module_notes_attrs *notes_attrs)
{ {
kfree(notes_attrs->grp.bin_attrs_new); kfree(notes_attrs->grp.bin_attrs);
kfree(notes_attrs); kfree(notes_attrs);
} }
@ -178,7 +178,7 @@ static int add_notes_attrs(struct module *mod, const struct load_info *info)
} }
notes_attrs->grp.name = "notes"; notes_attrs->grp.name = "notes";
notes_attrs->grp.bin_attrs_new = gattr; notes_attrs->grp.bin_attrs = gattr;
nattr = &notes_attrs->attrs[0]; nattr = &notes_attrs->attrs[0];
for (loaded = i = 0; i < info->hdr->e_shnum; ++i) { for (loaded = i = 0; i < info->hdr->e_shnum; ++i) {

View File

@ -208,7 +208,7 @@ static const struct bin_attribute *const page_idle_bin_attrs[] = {
}; };
static const struct attribute_group page_idle_attr_group = { static const struct attribute_group page_idle_attr_group = {
.bin_attrs_new = page_idle_bin_attrs, .bin_attrs = page_idle_bin_attrs,
.name = "page_idle", .name = "page_idle",
}; };