History

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.

Thomas Weißschuh committed 1 year ago

Commit fb506e31 parent 2fbe82071 files · +91 −91Browse files

Unified · Split

71 files
  1. arch/powerpc/kernel/secvar-sysfs.c +1 −1
  2. arch/powerpc/perf/hv-24x7.c +1 −1
  3. arch/powerpc/platforms/powernv/opal-core.c +1 −1
  4. arch/s390/kernel/cpacf.c +1 −1
  5. arch/s390/kernel/ipl.c +9 −9
  6. arch/s390/pci/pci_sysfs.c +1 −1
  7. arch/x86/kernel/ksysfs.c +2 −2
  8. drivers/accel/habanalabs/common/sysfs.c +1 −1
  9. drivers/acpi/bgrt.c +1 −1
  10. drivers/base/devcoredump.c +1 −1
  11. drivers/base/firmware_loader/sysfs.c +1 −1
  12. drivers/base/node.c +1 −1
  13. drivers/base/topology.c +1 −1
  14. drivers/cxl/port.c +1 −1
  15. drivers/firmware/google/cbmem.c +1 −1
  16. drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1 −1
  17. drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1 −1
  18. drivers/gpu/drm/drm_sysfs.c +1 −1
  19. drivers/hid/hid-core.c +1 −1
  20. drivers/hid/hid-roccat-arvo.c +1 −1
  21. drivers/hid/hid-roccat-isku.c +1 −1
  22. drivers/hid/hid-roccat-kone.c +1 −1
  23. drivers/hid/hid-roccat-koneplus.c +1 −1
  24. drivers/hid/hid-roccat-konepure.c +1 −1
  25. drivers/hid/hid-roccat-kovaplus.c +1 −1
  26. drivers/hid/hid-roccat-pyra.c +1 −1
  27. drivers/hid/hid-roccat-ryos.c +1 −1
  28. drivers/hid/hid-roccat-savu.c +1 −1
  29. drivers/iio/imu/bno055/bno055.c +1 −1
  30. drivers/infiniband/hw/hfi1/sysfs.c +1 −1
  31. drivers/infiniband/hw/qib/qib_sysfs.c +1 −1
  32. drivers/input/touchscreen/goodix_berlin_core.c +1 −1
  33. drivers/leds/led-class.c +1 −1
  34. drivers/misc/c2port/core.c +1 −1
  35. drivers/mtd/spi-nor/sysfs.c +1 −1
  36. drivers/nvmem/core.c +2 −2
  37. drivers/pci/p2pdma.c +1 −1
  38. drivers/pci/pci-sysfs.c +2 −2
  39. drivers/pci/vpd.c +1 −1
  40. drivers/platform/chrome/cros_ec_vbc.c +1 −1
  41. drivers/platform/x86/amd/hsmp/acpi.c +1 −1
  42. drivers/platform/x86/amd/hsmp/plat.c +1 −1
  43. drivers/platform/x86/dell/dcdbas.c +1 −1
  44. drivers/platform/x86/dell/dell_rbu.c +1 −1
  45. drivers/platform/x86/intel/sdsi.c +1 −1
  46. drivers/platform/x86/wmi-bmof.c +1 −1
  47. drivers/power/supply/ds2760_battery.c +1 −1
  48. drivers/power/supply/ds2780_battery.c +1 −1
  49. drivers/power/supply/ds2781_battery.c +1 −1
  50. drivers/power/supply/olpc_battery.c +1 −1
  51. drivers/ptp/ptp_ocp.c +1 −1
  52. drivers/rapidio/rio-sysfs.c +1 −1
  53. drivers/s390/cio/chp.c +1 −1
  54. drivers/s390/crypto/pkey_sysfs.c +4 −4
  55. drivers/scsi/scsi_sysfs.c +1 −1
  56. drivers/usb/core/sysfs.c +1 −1
  57. drivers/usb/usbip/vudc_sysfs.c +1 −1
  58. drivers/virt/coco/guest/tsm-mr.c +2 −2
  59. drivers/w1/slaves/w1_ds2408.c +1 −1
  60. drivers/w1/slaves/w1_ds2413.c +1 −1
  61. drivers/w1/slaves/w1_ds2430.c +1 −1
  62. drivers/w1/slaves/w1_ds2431.c +1 −1
  63. drivers/w1/slaves/w1_ds2433.c +2 −2
  64. drivers/w1/slaves/w1_ds2438.c +1 −1
  65. drivers/w1/slaves/w1_ds2780.c +1 −1
  66. drivers/w1/slaves/w1_ds2781.c +1 −1
  67. drivers/w1/slaves/w1_ds28e04.c +1 −1
  68. drivers/w1/w1.c +1 −1
  69. drivers/zorro/zorro-sysfs.c +1 −1
  70. kernel/module/sysfs.c +5 −5
  71. mm/page_idle.c +1 −1
arch/powerpc/kernel/secvar-sysfs.c+1−1
@@ -121,7 +121,7 @@ static struct attribute *secvar_attrs[] = { · 120 unmodified lines
121 121
122static const struct attribute_group secvar_attr_group = {122static const struct attribute_group secvar_attr_group = {
123 .attrs = secvar_attrs,123 .attrs = secvar_attrs,
124 .bin_attrs_new = secvar_bin_attrs,124 .bin_attrs = secvar_bin_attrs,
125};125};
126__ATTRIBUTE_GROUPS(secvar_attr);126__ATTRIBUTE_GROUPS(secvar_attr);
127 127
arch/powerpc/perf/hv-24x7.c+1−1
@@ -1141,7 +1141,7 @@ static struct attribute *if_attrs[] = { · 1140 unmodified lines
1141 1141
1142static const struct attribute_group if_group = {1142static const struct attribute_group if_group = {
1143 .name = "interface",1143 .name = "interface",
1144 .bin_attrs_new = if_bin_attrs,1144 .bin_attrs = if_bin_attrs,
1145 .attrs = if_attrs,1145 .attrs = if_attrs,
1146};1146};
1147 1147
arch/powerpc/platforms/powernv/opal-core.c+1−1
@@ -607,7 +607,7 @@ static const struct bin_attribute *const mpipl_bin_attr[] = { · 606 unmodified lines
607 607
608static const struct attribute_group mpipl_group = {608static const struct attribute_group mpipl_group = {
609 .attrs = mpipl_attr,609 .attrs = mpipl_attr,
610 .bin_attrs_new = mpipl_bin_attr,610 .bin_attrs = mpipl_bin_attr,
611};611};
612 612
613static int __init opalcore_init(void)613static int __init opalcore_init(void)
arch/s390/kernel/cpacf.c+1−1
@@ -101,7 +101,7 @@ static const struct bin_attribute *const cpacf_attrs[] = { · 100 unmodified lines
101 101
102static const struct attribute_group cpacf_attr_grp = {102static const struct attribute_group cpacf_attr_grp = {
103 .name = "cpacf",103 .name = "cpacf",
104 .bin_attrs_new = cpacf_attrs,104 .bin_attrs = cpacf_attrs,
105};105};
106 106
107static int __init cpacf_init(void)107static int __init cpacf_init(void)
arch/s390/kernel/ipl.c+9−9
@@ -596,7 +596,7 @@ static struct attribute *ipl_fcp_attrs[] = { · 595 unmodified lines
596 596
597static const struct attribute_group ipl_fcp_attr_group = {597static const struct attribute_group ipl_fcp_attr_group = {
598 .attrs = ipl_fcp_attrs,598 .attrs = ipl_fcp_attrs,
599 .bin_attrs_new = ipl_fcp_bin_attrs,599 .bin_attrs = ipl_fcp_bin_attrs,
600};600};
601 601
602static struct attribute *ipl_nvme_attrs[] = {602static struct attribute *ipl_nvme_attrs[] = {
@@ -610,7 +610,7 @@ static struct attribute *ipl_nvme_attrs[] = { · 7 unmodified lines
610 610
611static const struct attribute_group ipl_nvme_attr_group = {611static const struct attribute_group ipl_nvme_attr_group = {
612 .attrs = ipl_nvme_attrs,612 .attrs = ipl_nvme_attrs,
613 .bin_attrs_new = ipl_nvme_bin_attrs,613 .bin_attrs = ipl_nvme_bin_attrs,
614};614};
615 615
616static struct attribute *ipl_eckd_attrs[] = {616static struct attribute *ipl_eckd_attrs[] = {
@@ -623,7 +623,7 @@ static struct attribute *ipl_eckd_attrs[] = { · 6 unmodified lines
623 623
624static const struct attribute_group ipl_eckd_attr_group = {624static const struct attribute_group ipl_eckd_attr_group = {
625 .attrs = ipl_eckd_attrs,625 .attrs = ipl_eckd_attrs,
626 .bin_attrs_new = ipl_eckd_bin_attrs,626 .bin_attrs = ipl_eckd_bin_attrs,
627};627};
628 628
629/* CCW ipl device attributes */629/* CCW ipl device attributes */
@@ -920,7 +920,7 @@ static struct attribute *reipl_fcp_attrs[] = { · 290 unmodified lines
920 920
921static const struct attribute_group reipl_fcp_attr_group = {921static const struct attribute_group reipl_fcp_attr_group = {
922 .attrs = reipl_fcp_attrs,922 .attrs = reipl_fcp_attrs,
923 .bin_attrs_new = reipl_fcp_bin_attrs,923 .bin_attrs = reipl_fcp_bin_attrs,
924};924};
925 925
926static struct kobj_attribute sys_reipl_fcp_clear_attr =926static struct kobj_attribute sys_reipl_fcp_clear_attr =
@@ -958,7 +958,7 @@ static struct attribute *reipl_nvme_attrs[] = { · 31 unmodified lines
958 958
959static const struct attribute_group reipl_nvme_attr_group = {959static const struct attribute_group reipl_nvme_attr_group = {
960 .attrs = reipl_nvme_attrs,960 .attrs = reipl_nvme_attrs,
961 .bin_attrs_new = reipl_nvme_bin_attrs961 .bin_attrs = reipl_nvme_bin_attrs
962};962};
963 963
964static ssize_t reipl_nvme_clear_show(struct kobject *kobj,964static ssize_t reipl_nvme_clear_show(struct kobject *kobj,
@@ -1051,7 +1051,7 @@ static struct attribute *reipl_eckd_attrs[] = { · 86 unmodified lines
1051 1051
1052static const struct attribute_group reipl_eckd_attr_group = {1052static const struct attribute_group reipl_eckd_attr_group = {
1053 .attrs = reipl_eckd_attrs,1053 .attrs = reipl_eckd_attrs,
1054 .bin_attrs_new = reipl_eckd_bin_attrs1054 .bin_attrs = reipl_eckd_bin_attrs
1055};1055};
1056 1056
1057static ssize_t reipl_eckd_clear_show(struct kobject *kobj,1057static ssize_t reipl_eckd_clear_show(struct kobject *kobj,
@@ -1596,7 +1596,7 @@ static const struct bin_attribute *const dump_fcp_bin_attrs[] = { · 538 unmodified lines
1596static const struct attribute_group dump_fcp_attr_group = {1596static const struct attribute_group dump_fcp_attr_group = {
1597 .name = IPL_FCP_STR,1597 .name = IPL_FCP_STR,
1598 .attrs = dump_fcp_attrs,1598 .attrs = dump_fcp_attrs,
1599 .bin_attrs_new = dump_fcp_bin_attrs,1599 .bin_attrs = dump_fcp_bin_attrs,
1600};1600};
1601 1601
1602/* NVME dump device attributes */1602/* NVME dump device attributes */
@@ -1630,7 +1630,7 @@ static const struct bin_attribute *const dump_nvme_bin_attrs[] = { · 27 unmodified lines
1630static const struct attribute_group dump_nvme_attr_group = {1630static const struct attribute_group dump_nvme_attr_group = {
1631 .name = IPL_NVME_STR,1631 .name = IPL_NVME_STR,
1632 .attrs = dump_nvme_attrs,1632 .attrs = dump_nvme_attrs,
1633 .bin_attrs_new = dump_nvme_bin_attrs,1633 .bin_attrs = dump_nvme_bin_attrs,
1634};1634};
1635 1635
1636/* ECKD dump device attributes */1636/* ECKD dump device attributes */
@@ -1664,7 +1664,7 @@ static const struct bin_attribute *const dump_eckd_bin_attrs[] = { · 27 unmodified lines
1664static const struct attribute_group dump_eckd_attr_group = {1664static const struct attribute_group dump_eckd_attr_group = {
1665 .name = IPL_ECKD_STR,1665 .name = IPL_ECKD_STR,
1666 .attrs = dump_eckd_attrs,1666 .attrs = dump_eckd_attrs,
1667 .bin_attrs_new = dump_eckd_bin_attrs,1667 .bin_attrs = dump_eckd_bin_attrs,
1668};1668};
1669 1669
1670/* CCW dump device attributes */1670/* CCW dump device attributes */
arch/s390/pci/pci_sysfs.c+1−1
@@ -218,7 +218,7 @@ static struct attribute *zpci_dev_attrs[] = { · 217 unmodified lines
218 218
219const struct attribute_group zpci_attr_group = {219const struct attribute_group zpci_attr_group = {
220 .attrs = zpci_dev_attrs,220 .attrs = zpci_dev_attrs,
221 .bin_attrs_new = zpci_bin_attrs,221 .bin_attrs = zpci_bin_attrs,
222};222};
223 223
224static struct attribute *pfip_attrs[] = {224static struct attribute *pfip_attrs[] = {
arch/x86/kernel/ksysfs.c+2−2
@@ -56,7 +56,7 @@ static const struct bin_attribute *const boot_params_data_attrs[] = { · 55 unmodified lines
56 56
57static const struct attribute_group boot_params_attr_group = {57static const struct attribute_group boot_params_attr_group = {
58 .attrs = boot_params_version_attrs,58 .attrs = boot_params_version_attrs,
59 .bin_attrs_new = boot_params_data_attrs,59 .bin_attrs = boot_params_data_attrs,
60};60};
61 61
62static int kobj_to_setup_data_nr(struct kobject *kobj, int *nr)62static 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[] = { · 202 unmodified lines
265 265
266static const struct attribute_group setup_data_attr_group = {266static const struct attribute_group setup_data_attr_group = {
267 .attrs = setup_data_type_attrs,267 .attrs = setup_data_type_attrs,
268 .bin_attrs_new = setup_data_data_attrs,268 .bin_attrs = setup_data_data_attrs,
269};269};
270 270
271static int __init create_setup_data_node(struct kobject *parent,271static int __init create_setup_data_node(struct kobject *parent,
drivers/accel/habanalabs/common/sysfs.c+1−1
@@ -479,7 +479,7 @@ static const struct bin_attribute *const hl_dev_bin_attrs[] = { · 478 unmodified lines
479 479
480static struct attribute_group hl_dev_attr_group = {480static struct attribute_group hl_dev_attr_group = {
481 .attrs = hl_dev_attrs,481 .attrs = hl_dev_attrs,
482 .bin_attrs_new = hl_dev_bin_attrs,482 .bin_attrs = hl_dev_bin_attrs,
483};483};
484 484
485static struct attribute_group hl_dev_clks_attr_group;485static struct attribute_group hl_dev_clks_attr_group;
drivers/acpi/bgrt.c+1−1
@@ -47,7 +47,7 @@ static const struct bin_attribute *const bgrt_bin_attributes[] = { · 46 unmodified lines
47 47
48static const struct attribute_group bgrt_attribute_group = {48static const struct attribute_group bgrt_attribute_group = {
49 .attrs = bgrt_attributes,49 .attrs = bgrt_attributes,
50 .bin_attrs_new = bgrt_bin_attributes,50 .bin_attrs = bgrt_bin_attributes,
51};51};
52 52
53int __init acpi_parse_bgrt(struct acpi_table_header *table)53int __init acpi_parse_bgrt(struct acpi_table_header *table)
drivers/base/devcoredump.c+1−1
@@ -140,7 +140,7 @@ static const struct bin_attribute *const devcd_dev_bin_attrs[] = { · 139 unmodified lines
140};140};
141 141
142static const struct attribute_group devcd_dev_group = {142static const struct attribute_group devcd_dev_group = {
143 .bin_attrs_new = devcd_dev_bin_attrs,143 .bin_attrs = devcd_dev_bin_attrs,
144};144};
145 145
146static const struct attribute_group *devcd_dev_groups[] = {146static const struct attribute_group *devcd_dev_groups[] = {
drivers/base/firmware_loader/sysfs.c+1−1
@@ -381,7 +381,7 @@ static const struct bin_attribute *const fw_dev_bin_attrs[] = { · 380 unmodified lines
381 381
382static const struct attribute_group fw_dev_attr_group = {382static const struct attribute_group fw_dev_attr_group = {
383 .attrs = fw_dev_attrs,383 .attrs = fw_dev_attrs,
384 .bin_attrs_new = fw_dev_bin_attrs,384 .bin_attrs = fw_dev_bin_attrs,
385#ifdef CONFIG_FW_UPLOAD385#ifdef CONFIG_FW_UPLOAD
386 .is_visible = fw_upload_is_visible,386 .is_visible = fw_upload_is_visible,
387#endif387#endif
drivers/base/node.c+1−1
@@ -597,7 +597,7 @@ static const struct bin_attribute *node_dev_bin_attrs[] = { · 596 unmodified lines
597 597
598static const struct attribute_group node_dev_group = {598static const struct attribute_group node_dev_group = {
599 .attrs = node_dev_attrs,599 .attrs = node_dev_attrs,
600 .bin_attrs_new = node_dev_bin_attrs,600 .bin_attrs = node_dev_bin_attrs,
601};601};
602 602
603static const struct attribute_group *node_dev_groups[] = {603static const struct attribute_group *node_dev_groups[] = {
drivers/base/topology.c+1−1
@@ -179,7 +179,7 @@ static umode_t topology_is_visible(struct kobject *kobj, · 178 unmodified lines
179 179
180static const struct attribute_group topology_attr_group = {180static const struct attribute_group topology_attr_group = {
181 .attrs = default_attrs,181 .attrs = default_attrs,
182 .bin_attrs_new = bin_attrs,182 .bin_attrs = bin_attrs,
183 .is_visible = topology_is_visible,183 .is_visible = topology_is_visible,
184 .name = "topology"184 .name = "topology"
185};185};
drivers/cxl/port.c+1−1
@@ -181,7 +181,7 @@ static const struct bin_attribute *const cxl_cdat_bin_attributes[] = { · 180 unmodified lines
181};181};
182 182
183static const struct attribute_group cxl_cdat_attribute_group = {183static const struct attribute_group cxl_cdat_attribute_group = {
184 .bin_attrs_new = cxl_cdat_bin_attributes,184 .bin_attrs = cxl_cdat_bin_attributes,
185 .is_bin_visible = cxl_port_bin_attr_is_visible,185 .is_bin_visible = cxl_port_bin_attr_is_visible,
186};186};
187 187
drivers/firmware/google/cbmem.c+1−1
@@ -86,7 +86,7 @@ static const struct bin_attribute *const bin_attrs[] = { · 85 unmodified lines
86 86
87static const struct attribute_group cbmem_entry_group = {87static const struct attribute_group cbmem_entry_group = {
88 .attrs = attrs,88 .attrs = attrs,
89 .bin_attrs_new = bin_attrs,89 .bin_attrs = bin_attrs,
90};90};
91 91
92static const struct attribute_group *dev_groups[] = {92static const struct attribute_group *dev_groups[] = {
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c+1−1
@@ -4181,7 +4181,7 @@ static umode_t amdgpu_bin_flash_attr_is_visible(struct kobject *kobj, · 4180 unmodified lines
4181 4181
4182const struct attribute_group amdgpu_flash_attr_group = {4182const struct attribute_group amdgpu_flash_attr_group = {
4183 .attrs = flash_attrs,4183 .attrs = flash_attrs,
4184 .bin_attrs_new = bin_flash_attrs,4184 .bin_attrs = bin_flash_attrs,
4185 .is_bin_visible = amdgpu_bin_flash_attr_is_visible,4185 .is_bin_visible = amdgpu_bin_flash_attr_is_visible,
4186 .is_visible = amdgpu_flash_attr_is_visible,4186 .is_visible = amdgpu_flash_attr_is_visible,
4187};4187};
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c+1−1
@@ -2124,7 +2124,7 @@ static int amdgpu_ras_fs_init(struct amdgpu_device *adev) · 2123 unmodified lines
2124 con->badpages_attr = bin_attr_gpu_vram_bad_pages;2124 con->badpages_attr = bin_attr_gpu_vram_bad_pages;
2125 sysfs_bin_attr_init(&con->badpages_attr);2125 sysfs_bin_attr_init(&con->badpages_attr);
2126 bin_attrs[0] = &con->badpages_attr;2126 bin_attrs[0] = &con->badpages_attr;
2127 group.bin_attrs_new = bin_attrs;2127 group.bin_attrs = bin_attrs;
2128 }2128 }
2129 2129
2130 r = sysfs_create_group(&adev->dev->kobj, &group);2130 r = sysfs_create_group(&adev->dev->kobj, &group);
drivers/gpu/drm/drm_sysfs.c+1−1
@@ -329,7 +329,7 @@ static const struct bin_attribute *const connector_bin_attrs[] = { · 328 unmodified lines
329 329
330static const struct attribute_group connector_dev_group = {330static const struct attribute_group connector_dev_group = {
331 .attrs = connector_dev_attrs,331 .attrs = connector_dev_attrs,
332 .bin_attrs_new = connector_bin_attrs,332 .bin_attrs = connector_bin_attrs,
333};333};
334 334
335static const struct attribute_group *connector_dev_groups[] = {335static const struct attribute_group *connector_dev_groups[] = {
drivers/hid/hid-core.c+1−1
@@ -2812,7 +2812,7 @@ static const struct bin_attribute *hid_dev_bin_attrs[] = { · 2811 unmodified lines
2812};2812};
2813static const struct attribute_group hid_dev_group = {2813static const struct attribute_group hid_dev_group = {
2814 .attrs = hid_dev_attrs,2814 .attrs = hid_dev_attrs,
2815 .bin_attrs_new = hid_dev_bin_attrs,2815 .bin_attrs = hid_dev_bin_attrs,
2816};2816};
2817__ATTRIBUTE_GROUPS(hid_dev);2817__ATTRIBUTE_GROUPS(hid_dev);
2818 2818
drivers/hid/hid-roccat-arvo.c+1−1
@@ -258,7 +258,7 @@ static const struct bin_attribute *const arvo_bin_attributes[] = { · 257 unmodified lines
258 258
259static const struct attribute_group arvo_group = {259static const struct attribute_group arvo_group = {
260 .attrs = arvo_attrs,260 .attrs = arvo_attrs,
261 .bin_attrs_new = arvo_bin_attributes,261 .bin_attrs = arvo_bin_attributes,
262};262};
263 263
264static const struct attribute_group *arvo_groups[] = {264static const struct attribute_group *arvo_groups[] = {
drivers/hid/hid-roccat-isku.c+1−1
@@ -238,7 +238,7 @@ static const struct bin_attribute *const isku_bin_attributes[] = { · 237 unmodified lines
238 238
239static const struct attribute_group isku_group = {239static const struct attribute_group isku_group = {
240 .attrs = isku_attrs,240 .attrs = isku_attrs,
241 .bin_attrs_new = isku_bin_attributes,241 .bin_attrs = isku_bin_attributes,
242};242};
243 243
244static const struct attribute_group *isku_groups[] = {244static const struct attribute_group *isku_groups[] = {
drivers/hid/hid-roccat-kone.c+1−1
@@ -646,7 +646,7 @@ static const struct bin_attribute *const kone_bin_attributes[] = { · 645 unmodified lines
646 646
647static const struct attribute_group kone_group = {647static const struct attribute_group kone_group = {
648 .attrs = kone_attrs,648 .attrs = kone_attrs,
649 .bin_attrs_new = kone_bin_attributes,649 .bin_attrs = kone_bin_attributes,
650};650};
651 651
652static const struct attribute_group *kone_groups[] = {652static const struct attribute_group *kone_groups[] = {
drivers/hid/hid-roccat-koneplus.c+1−1
@@ -346,7 +346,7 @@ static const struct bin_attribute *const koneplus_bin_attributes[] = { · 345 unmodified lines
346 346
347static const struct attribute_group koneplus_group = {347static const struct attribute_group koneplus_group = {
348 .attrs = koneplus_attrs,348 .attrs = koneplus_attrs,
349 .bin_attrs_new = koneplus_bin_attributes,349 .bin_attrs = koneplus_bin_attributes,
350};350};
351 351
352static const struct attribute_group *koneplus_groups[] = {352static const struct attribute_group *koneplus_groups[] = {
drivers/hid/hid-roccat-konepure.c+1−1
@@ -62,7 +62,7 @@ static const struct bin_attribute *const konepure_bin_attrs[] = { · 61 unmodified lines
62};62};
63 63
64static const struct attribute_group konepure_group = {64static const struct attribute_group konepure_group = {
65 .bin_attrs_new = konepure_bin_attrs,65 .bin_attrs = konepure_bin_attrs,
66};66};
67 67
68static const struct attribute_group *konepure_groups[] = {68static const struct attribute_group *konepure_groups[] = {
drivers/hid/hid-roccat-kovaplus.c+1−1
@@ -399,7 +399,7 @@ static const struct bin_attribute *const kovaplus_bin_attributes[] = { · 398 unmodified lines
399 399
400static const struct attribute_group kovaplus_group = {400static const struct attribute_group kovaplus_group = {
401 .attrs = kovaplus_attrs,401 .attrs = kovaplus_attrs,
402 .bin_attrs_new = kovaplus_bin_attributes,402 .bin_attrs = kovaplus_bin_attributes,
403};403};
404 404
405static const struct attribute_group *kovaplus_groups[] = {405static const struct attribute_group *kovaplus_groups[] = {
drivers/hid/hid-roccat-pyra.c+1−1
@@ -355,7 +355,7 @@ static const struct bin_attribute *const pyra_bin_attributes[] = { · 354 unmodified lines
355 355
356static const struct attribute_group pyra_group = {356static const struct attribute_group pyra_group = {
357 .attrs = pyra_attrs,357 .attrs = pyra_attrs,
358 .bin_attrs_new = pyra_bin_attributes,358 .bin_attrs = pyra_bin_attributes,
359};359};
360 360
361static const struct attribute_group *pyra_groups[] = {361static const struct attribute_group *pyra_groups[] = {
drivers/hid/hid-roccat-ryos.c+1−1
@@ -70,7 +70,7 @@ static const struct bin_attribute *const ryos_bin_attrs[] = { · 69 unmodified lines
70};70};
71 71
72static const struct attribute_group ryos_group = {72static const struct attribute_group ryos_group = {
73 .bin_attrs_new = ryos_bin_attrs,73 .bin_attrs = ryos_bin_attrs,
74};74};
75 75
76static const struct attribute_group *ryos_groups[] = {76static const struct attribute_group *ryos_groups[] = {
drivers/hid/hid-roccat-savu.c+1−1
@@ -42,7 +42,7 @@ static const struct bin_attribute *const savu_bin_attrs[] = { · 41 unmodified lines
42};42};
43 43
44static const struct attribute_group savu_group = {44static const struct attribute_group savu_group = {
45 .bin_attrs_new = savu_bin_attrs,45 .bin_attrs = savu_bin_attrs,
46};46};
47 47
48static const struct attribute_group *savu_groups[] = {48static const struct attribute_group *savu_groups[] = {
drivers/iio/imu/bno055/bno055.c+1−1
@@ -1357,7 +1357,7 @@ static const struct bin_attribute *const bno055_bin_attrs[] = { · 1356 unmodified lines
1357 1357
1358static const struct attribute_group bno055_attrs_group = {1358static const struct attribute_group bno055_attrs_group = {
1359 .attrs = bno055_attrs,1359 .attrs = bno055_attrs,
1360 .bin_attrs_new = bno055_bin_attrs,1360 .bin_attrs = bno055_bin_attrs,
1361};1361};
1362 1362
1363static const struct iio_info bno055_info = {1363static const struct iio_info bno055_info = {
drivers/infiniband/hw/hfi1/sysfs.c+1−1
@@ -134,7 +134,7 @@ static struct attribute *port_cc_attributes[] = { · 133 unmodified lines
134static const struct attribute_group port_cc_group = {134static const struct attribute_group port_cc_group = {
135 .name = "CCMgtA",135 .name = "CCMgtA",
136 .attrs = port_cc_attributes,136 .attrs = port_cc_attributes,
137 .bin_attrs_new = port_cc_bin_attributes,137 .bin_attrs = port_cc_bin_attributes,
138};138};
139 139
140/* Start sc2vl */140/* Start sc2vl */
drivers/infiniband/hw/qib/qib_sysfs.c+1−1
@@ -295,7 +295,7 @@ static umode_t qib_ccmgta_is_bin_visible(struct kobject *kobj, · 294 unmodified lines
295static const struct attribute_group port_ccmgta_attribute_group = {295static const struct attribute_group port_ccmgta_attribute_group = {
296 .name = "CCMgtA",296 .name = "CCMgtA",
297 .is_bin_visible = qib_ccmgta_is_bin_visible,297 .is_bin_visible = qib_ccmgta_is_bin_visible,
298 .bin_attrs_new = port_ccmgta_attributes,298 .bin_attrs = port_ccmgta_attributes,
299};299};
300 300
301/* Start sl2vl */301/* Start sl2vl */
drivers/input/touchscreen/goodix_berlin_core.c+1−1
@@ -707,7 +707,7 @@ static const struct bin_attribute *const goodix_berlin_bin_attrs[] = { · 706 unmodified lines
707};707};
708 708
709static const struct attribute_group goodix_berlin_attr_group = {709static const struct attribute_group goodix_berlin_attr_group = {
710 .bin_attrs_new = goodix_berlin_bin_attrs,710 .bin_attrs = goodix_berlin_bin_attrs,
711};711};
712 712
713const struct attribute_group *goodix_berlin_groups[] = {713const struct attribute_group *goodix_berlin_groups[] = {
drivers/leds/led-class.c+1−1
@@ -91,7 +91,7 @@ static const struct bin_attribute *const led_trigger_bin_attrs[] = { · 90 unmodified lines
91 NULL,91 NULL,
92};92};
93static const struct attribute_group led_trigger_group = {93static const struct attribute_group led_trigger_group = {
94 .bin_attrs_new = led_trigger_bin_attrs,94 .bin_attrs = led_trigger_bin_attrs,
95};95};
96#endif96#endif
97 97
drivers/misc/c2port/core.c+1−1
@@ -888,7 +888,7 @@ static size_t c2port_bin_attr_size(struct kobject *kobj, · 887 unmodified lines
888 888
889static const struct attribute_group c2port_group = {889static const struct attribute_group c2port_group = {
890 .attrs = c2port_attrs,890 .attrs = c2port_attrs,
891 .bin_attrs_new = c2port_bin_attrs,891 .bin_attrs = c2port_bin_attrs,
892 .bin_size = c2port_bin_attr_size,892 .bin_size = c2port_bin_attr_size,
893};893};
894 894
drivers/mtd/spi-nor/sysfs.c+1−1
@@ -104,7 +104,7 @@ static const struct attribute_group spi_nor_sysfs_group = { · 103 unmodified lines
104 .is_visible = spi_nor_sysfs_is_visible,104 .is_visible = spi_nor_sysfs_is_visible,
105 .is_bin_visible = spi_nor_sysfs_is_bin_visible,105 .is_bin_visible = spi_nor_sysfs_is_bin_visible,
106 .attrs = spi_nor_sysfs_entries,106 .attrs = spi_nor_sysfs_entries,
107 .bin_attrs_new = spi_nor_sysfs_bin_entries,107 .bin_attrs = spi_nor_sysfs_bin_entries,
108};108};
109 109
110const struct attribute_group *spi_nor_sysfs_groups[] = {110const struct attribute_group *spi_nor_sysfs_groups[] = {
drivers/nvmem/core.c+2−2
@@ -386,7 +386,7 @@ static const struct bin_attribute *const nvmem_bin_attributes[] = { · 385 unmodified lines
386};386};
387 387
388static const struct attribute_group nvmem_bin_group = {388static const struct attribute_group nvmem_bin_group = {
389 .bin_attrs_new = nvmem_bin_attributes,389 .bin_attrs = nvmem_bin_attributes,
390 .attrs = nvmem_attrs,390 .attrs = nvmem_attrs,
391 .is_bin_visible = nvmem_bin_attr_is_visible,391 .is_bin_visible = nvmem_bin_attr_is_visible,
392 .bin_size = nvmem_bin_attr_size,392 .bin_size = nvmem_bin_attr_size,
@@ -503,7 +503,7 @@ static int nvmem_populate_sysfs_cells(struct nvmem_device *nvmem) · 110 unmodified lines
503 i++;503 i++;
504 }504 }
505 505
506 group.bin_attrs_new = pattrs;506 group.bin_attrs = pattrs;
507 507
508 ret = device_add_group(&nvmem->dev, &group);508 ret = device_add_group(&nvmem->dev, &group);
509 if (ret)509 if (ret)
drivers/pci/p2pdma.c+1−1
@@ -196,7 +196,7 @@ static const struct bin_attribute *const p2pmem_bin_attrs[] = { · 195 unmodified lines
196 196
197static const struct attribute_group p2pmem_group = {197static const struct attribute_group p2pmem_group = {
198 .attrs = p2pmem_attrs,198 .attrs = p2pmem_attrs,
199 .bin_attrs_new = p2pmem_bin_attrs,199 .bin_attrs = p2pmem_bin_attrs,
200 .name = "p2pmem",200 .name = "p2pmem",
201};201};
202 202
drivers/pci/pci-sysfs.c+2−2
@@ -857,7 +857,7 @@ static size_t pci_dev_config_attr_bin_size(struct kobject *kobj, · 856 unmodified lines
857}857}
858 858
859static const struct attribute_group pci_dev_config_attr_group = {859static const struct attribute_group pci_dev_config_attr_group = {
860 .bin_attrs_new = pci_dev_config_attrs,860 .bin_attrs = pci_dev_config_attrs,
861 .bin_size = pci_dev_config_attr_bin_size,861 .bin_size = pci_dev_config_attr_bin_size,
862};862};
863 863
@@ -1377,7 +1377,7 @@ static size_t pci_dev_rom_attr_bin_size(struct kobject *kobj, · 513 unmodified lines
1377}1377}
1378 1378
1379static const struct attribute_group pci_dev_rom_attr_group = {1379static const struct attribute_group pci_dev_rom_attr_group = {
1380 .bin_attrs_new = pci_dev_rom_attrs,1380 .bin_attrs = pci_dev_rom_attrs,
1381 .is_bin_visible = pci_dev_rom_attr_is_visible,1381 .is_bin_visible = pci_dev_rom_attr_is_visible,
1382 .bin_size = pci_dev_rom_attr_bin_size,1382 .bin_size = pci_dev_rom_attr_bin_size,
1383};1383};
drivers/pci/vpd.c+1−1
@@ -336,7 +336,7 @@ static umode_t vpd_attr_is_visible(struct kobject *kobj, · 335 unmodified lines
336}336}
337 337
338const struct attribute_group pci_dev_vpd_attr_group = {338const struct attribute_group pci_dev_vpd_attr_group = {
339 .bin_attrs_new = vpd_attrs,339 .bin_attrs = vpd_attrs,
340 .is_bin_visible = vpd_attr_is_visible,340 .is_bin_visible = vpd_attr_is_visible,
341};341};
342 342
drivers/platform/chrome/cros_ec_vbc.c+1−1
@@ -108,7 +108,7 @@ static const struct bin_attribute *const cros_ec_vbc_bin_attrs[] = { · 107 unmodified lines
108 108
109static const struct attribute_group cros_ec_vbc_attr_group = {109static const struct attribute_group cros_ec_vbc_attr_group = {
110 .name = "vbc",110 .name = "vbc",
111 .bin_attrs_new = cros_ec_vbc_bin_attrs,111 .bin_attrs = cros_ec_vbc_bin_attrs,
112};112};
113 113
114static int cros_ec_vbc_probe(struct platform_device *pd)114static int cros_ec_vbc_probe(struct platform_device *pd)
drivers/platform/x86/amd/hsmp/acpi.c+1−1
@@ -560,7 +560,7 @@ static struct attribute *hsmp_dev_attr_list[] = { · 559 unmodified lines
560};560};
561 561
562static const struct attribute_group hsmp_attr_grp = {562static const struct attribute_group hsmp_attr_grp = {
563 .bin_attrs_new = hsmp_attr_list,563 .bin_attrs = hsmp_attr_list,
564 .attrs = hsmp_dev_attr_list,564 .attrs = hsmp_dev_attr_list,
565 .is_bin_visible = hsmp_is_sock_attr_visible,565 .is_bin_visible = hsmp_is_sock_attr_visible,
566 .is_visible = hsmp_is_sock_dev_attr_visible,566 .is_visible = hsmp_is_sock_dev_attr_visible,
drivers/platform/x86/amd/hsmp/plat.c+1−1
@@ -110,7 +110,7 @@ HSMP_BIN_ATTR(7, *sock7_attr_list); · 109 unmodified lines
110 110
111#define HSMP_BIN_ATTR_GRP(index, _list, _name) \111#define HSMP_BIN_ATTR_GRP(index, _list, _name) \
112static const struct attribute_group sock##index##_attr_grp = { \112static const struct attribute_group sock##index##_attr_grp = { \
113 .bin_attrs_new = _list, \113 .bin_attrs = _list, \
114 .is_bin_visible = hsmp_is_sock_attr_visible, \114 .is_bin_visible = hsmp_is_sock_attr_visible, \
115 .name = #_name, \115 .name = #_name, \
116}116}
drivers/platform/x86/dell/dcdbas.c+1−1
@@ -662,7 +662,7 @@ static struct attribute *dcdbas_dev_attrs[] = { · 661 unmodified lines
662 662
663static const struct attribute_group dcdbas_attr_group = {663static const struct attribute_group dcdbas_attr_group = {
664 .attrs = dcdbas_dev_attrs,664 .attrs = dcdbas_dev_attrs,
665 .bin_attrs_new = dcdbas_bin_attrs,665 .bin_attrs = dcdbas_bin_attrs,
666};666};
667 667
668static int dcdbas_probe(struct platform_device *dev)668static int dcdbas_probe(struct platform_device *dev)
drivers/platform/x86/dell/dell_rbu.c+1−1
@@ -636,7 +636,7 @@ static const struct bin_attribute *const rbu_bin_attrs[] = { · 635 unmodified lines
636};636};
637 637
638static const struct attribute_group rbu_group = {638static const struct attribute_group rbu_group = {
639 .bin_attrs_new = rbu_bin_attrs,639 .bin_attrs = rbu_bin_attrs,
640};640};
641 641
642static int __init dcdrbu_init(void)642static int __init dcdrbu_init(void)
drivers/platform/x86/intel/sdsi.c+1−1
@@ -576,7 +576,7 @@ static struct attribute *sdsi_attrs[] = { · 575 unmodified lines
576 576
577static const struct attribute_group sdsi_group = {577static const struct attribute_group sdsi_group = {
578 .attrs = sdsi_attrs,578 .attrs = sdsi_attrs,
579 .bin_attrs_new = sdsi_bin_attrs,579 .bin_attrs = sdsi_bin_attrs,
580 .is_bin_visible = sdsi_battr_is_visible,580 .is_bin_visible = sdsi_battr_is_visible,
581};581};
582__ATTRIBUTE_GROUPS(sdsi);582__ATTRIBUTE_GROUPS(sdsi);
drivers/platform/x86/wmi-bmof.c+1−1
@@ -46,7 +46,7 @@ static size_t bmof_bin_size(struct kobject *kobj, const struct bin_attribute *at · 45 unmodified lines
46 46
47static const struct attribute_group bmof_group = {47static const struct attribute_group bmof_group = {
48 .bin_size = bmof_bin_size,48 .bin_size = bmof_bin_size,
49 .bin_attrs_new = bmof_attrs,49 .bin_attrs = bmof_attrs,
50};50};
51 51
52static const struct attribute_group *bmof_groups[] = {52static const struct attribute_group *bmof_groups[] = {
drivers/power/supply/ds2760_battery.c+1−1
@@ -209,7 +209,7 @@ static const struct bin_attribute *const w1_ds2760_bin_attrs[] = { · 208 unmodified lines
209};209};
210 210
211static const struct attribute_group w1_ds2760_group = {211static const struct attribute_group w1_ds2760_group = {
212 .bin_attrs_new = w1_ds2760_bin_attrs,212 .bin_attrs = w1_ds2760_bin_attrs,
213};213};
214 214
215static const struct attribute_group *w1_ds2760_groups[] = {215static const struct attribute_group *w1_ds2760_groups[] = {
drivers/power/supply/ds2780_battery.c+1−1
@@ -734,7 +734,7 @@ static const struct bin_attribute *const ds2780_sysfs_bin_attrs[] = { · 733 unmodified lines
734 734
735static const struct attribute_group ds2780_sysfs_group = {735static const struct attribute_group ds2780_sysfs_group = {
736 .attrs = ds2780_sysfs_attrs,736 .attrs = ds2780_sysfs_attrs,
737 .bin_attrs_new = ds2780_sysfs_bin_attrs,737 .bin_attrs = ds2780_sysfs_bin_attrs,
738};738};
739 739
740static const struct attribute_group *ds2780_sysfs_groups[] = {740static const struct attribute_group *ds2780_sysfs_groups[] = {
drivers/power/supply/ds2781_battery.c+1−1
@@ -737,7 +737,7 @@ static const struct bin_attribute *const ds2781_sysfs_bin_attrs[] = { · 736 unmodified lines
737 737
738static const struct attribute_group ds2781_sysfs_group = {738static const struct attribute_group ds2781_sysfs_group = {
739 .attrs = ds2781_sysfs_attrs,739 .attrs = ds2781_sysfs_attrs,
740 .bin_attrs_new = ds2781_sysfs_bin_attrs,740 .bin_attrs = ds2781_sysfs_bin_attrs,
741 741
742};742};
743 743
drivers/power/supply/olpc_battery.c+1−1
@@ -591,7 +591,7 @@ static const struct bin_attribute *const olpc_bat_sysfs_bin_attrs[] = { · 590 unmodified lines
591 591
592static const struct attribute_group olpc_bat_sysfs_group = {592static const struct attribute_group olpc_bat_sysfs_group = {
593 .attrs = olpc_bat_sysfs_attrs,593 .attrs = olpc_bat_sysfs_attrs,
594 .bin_attrs_new = olpc_bat_sysfs_bin_attrs,594 .bin_attrs = olpc_bat_sysfs_bin_attrs,
595};595};
596 596
597static const struct attribute_group *olpc_bat_sysfs_groups[] = {597static const struct attribute_group *olpc_bat_sysfs_groups[] = {
drivers/ptp/ptp_ocp.c+1−1
@@ -3938,7 +3938,7 @@ static const struct bin_attribute *const bin_art_timecard_attrs[] = { · 3937 unmodified lines
3938 3938
3939static const struct attribute_group art_timecard_group = {3939static const struct attribute_group art_timecard_group = {
3940 .attrs = art_timecard_attrs,3940 .attrs = art_timecard_attrs,
3941 .bin_attrs_new = bin_art_timecard_attrs,3941 .bin_attrs = bin_art_timecard_attrs,
3942};3942};
3943 3943
3944static const struct ocp_attr_group art_timecard_groups[] = {3944static const struct ocp_attr_group art_timecard_groups[] = {
drivers/rapidio/rio-sysfs.c+1−1
@@ -278,7 +278,7 @@ static umode_t rio_dev_is_attr_visible(struct kobject *kobj, · 277 unmodified lines
278static const struct attribute_group rio_dev_group = {278static const struct attribute_group rio_dev_group = {
279 .attrs = rio_dev_attrs,279 .attrs = rio_dev_attrs,
280 .is_visible = rio_dev_is_attr_visible,280 .is_visible = rio_dev_is_attr_visible,
281 .bin_attrs_new = rio_dev_bin_attrs,281 .bin_attrs = rio_dev_bin_attrs,
282};282};
283 283
284const struct attribute_group *rio_dev_groups[] = {284const struct attribute_group *rio_dev_groups[] = {
drivers/s390/cio/chp.c+1−1
@@ -470,7 +470,7 @@ static struct attribute *chp_attrs[] = { · 469 unmodified lines
470};470};
471static const struct attribute_group chp_attr_group = {471static const struct attribute_group chp_attr_group = {
472 .attrs = chp_attrs,472 .attrs = chp_attrs,
473 .bin_attrs_new = chp_bin_attrs,473 .bin_attrs = chp_bin_attrs,
474};474};
475static const struct attribute_group *chp_attr_groups[] = {475static const struct attribute_group *chp_attr_groups[] = {
476 &chp_attr_group,476 &chp_attr_group,
drivers/s390/crypto/pkey_sysfs.c+4−4
@@ -297,7 +297,7 @@ static const struct bin_attribute *const protkey_attrs[] = { · 296 unmodified lines
297 297
298static const struct attribute_group protkey_attr_group = {298static const struct attribute_group protkey_attr_group = {
299 .name = "protkey",299 .name = "protkey",
300 .bin_attrs_new = protkey_attrs,300 .bin_attrs = protkey_attrs,
301};301};
302 302
303/*303/*
@@ -406,7 +406,7 @@ static const struct bin_attribute *const ccadata_attrs[] = { · 102 unmodified lines
406 406
407static const struct attribute_group ccadata_attr_group = {407static const struct attribute_group ccadata_attr_group = {
408 .name = "ccadata",408 .name = "ccadata",
409 .bin_attrs_new = ccadata_attrs,409 .bin_attrs = ccadata_attrs,
410};410};
411 411
412#define CCACIPHERTOKENSIZE (sizeof(struct cipherkeytoken) + 80)412#define CCACIPHERTOKENSIZE (sizeof(struct cipherkeytoken) + 80)
@@ -520,7 +520,7 @@ static const struct bin_attribute *const ccacipher_attrs[] = { · 107 unmodified lines
520 520
521static const struct attribute_group ccacipher_attr_group = {521static const struct attribute_group ccacipher_attr_group = {
522 .name = "ccacipher",522 .name = "ccacipher",
523 .bin_attrs_new = ccacipher_attrs,523 .bin_attrs = ccacipher_attrs,
524};524};
525 525
526/*526/*
@@ -635,7 +635,7 @@ static const struct bin_attribute *const ep11_attrs[] = { · 108 unmodified lines
635 635
636static const struct attribute_group ep11_attr_group = {636static const struct attribute_group ep11_attr_group = {
637 .name = "ep11",637 .name = "ep11",
638 .bin_attrs_new = ep11_attrs,638 .bin_attrs = ep11_attrs,
639};639};
640 640
641const struct attribute_group *pkey_attr_groups[] = {641const struct attribute_group *pkey_attr_groups[] = {
drivers/scsi/scsi_sysfs.c+1−1
@@ -1362,7 +1362,7 @@ static const struct bin_attribute *const scsi_sdev_bin_attrs[] = { · 1361 unmodified lines
1362};1362};
1363static struct attribute_group scsi_sdev_attr_group = {1363static struct attribute_group scsi_sdev_attr_group = {
1364 .attrs = scsi_sdev_attrs,1364 .attrs = scsi_sdev_attrs,
1365 .bin_attrs_new = scsi_sdev_bin_attrs,1365 .bin_attrs = scsi_sdev_bin_attrs,
1366 .is_visible = scsi_sdev_attr_is_visible,1366 .is_visible = scsi_sdev_attr_is_visible,
1367 .is_bin_visible = scsi_sdev_bin_attr_is_visible,1367 .is_bin_visible = scsi_sdev_bin_attr_is_visible,
1368};1368};
drivers/usb/core/sysfs.c+1−1
@@ -944,7 +944,7 @@ static umode_t dev_bin_attrs_are_visible(struct kobject *kobj, · 943 unmodified lines
944}944}
945 945
946static const struct attribute_group dev_bin_attr_grp = {946static const struct attribute_group dev_bin_attr_grp = {
947 .bin_attrs_new = dev_bin_attrs,947 .bin_attrs = dev_bin_attrs,
948 .is_bin_visible = dev_bin_attrs_are_visible,948 .is_bin_visible = dev_bin_attrs_are_visible,
949};949};
950 950
drivers/usb/usbip/vudc_sysfs.c+1−1
@@ -259,7 +259,7 @@ static const struct bin_attribute *const dev_bin_attrs[] = { · 258 unmodified lines
259 259
260static const struct attribute_group vudc_attr_group = {260static const struct attribute_group vudc_attr_group = {
261 .attrs = dev_attrs,261 .attrs = dev_attrs,
262 .bin_attrs_new = dev_bin_attrs,262 .bin_attrs = dev_bin_attrs,
263};263};
264 264
265const struct attribute_group *vudc_groups[] = {265const struct attribute_group *vudc_groups[] = {
drivers/virt/coco/guest/tsm-mr.c+2−2
@@ -228,7 +228,7 @@ tsm_mr_create_attribute_group(const struct tsm_measurements *tm) · 227 unmodified lines
228 228
229 init_rwsem(&ctx->rwsem);229 init_rwsem(&ctx->rwsem);
230 ctx->agrp.name = "measurements";230 ctx->agrp.name = "measurements";
231 ctx->agrp.bin_attrs_new = no_free_ptr(attrs);231 ctx->agrp.bin_attrs = no_free_ptr(attrs);
232 ctx->tm = tm;232 ctx->tm = tm;
233 return &no_free_ptr(ctx)->agrp;233 return &no_free_ptr(ctx)->agrp;
234}234}
@@ -244,7 +244,7 @@ EXPORT_SYMBOL_GPL(tsm_mr_create_attribute_group); · 9 unmodified lines
244void tsm_mr_free_attribute_group(const struct attribute_group *attr_grp)244void tsm_mr_free_attribute_group(const struct attribute_group *attr_grp)
245{245{
246 if (!IS_ERR_OR_NULL(attr_grp)) {246 if (!IS_ERR_OR_NULL(attr_grp)) {
247 kfree(attr_grp->bin_attrs_new);247 kfree(attr_grp->bin_attrs);
248 kfree(container_of(attr_grp, struct tm_context, agrp));248 kfree(container_of(attr_grp, struct tm_context, agrp));
249 }249 }
250}250}
drivers/w1/slaves/w1_ds2408.c+1−1
@@ -328,7 +328,7 @@ static const struct bin_attribute *const w1_f29_bin_attrs[] = { · 327 unmodified lines
328};328};
329 329
330static const struct attribute_group w1_f29_group = {330static const struct attribute_group w1_f29_group = {
331 .bin_attrs_new = w1_f29_bin_attrs,331 .bin_attrs = w1_f29_bin_attrs,
332};332};
333 333
334static const struct attribute_group *w1_f29_groups[] = {334static const struct attribute_group *w1_f29_groups[] = {
drivers/w1/slaves/w1_ds2413.c+1−1
@@ -137,7 +137,7 @@ static const struct bin_attribute *const w1_f3a_bin_attrs[] = { · 136 unmodified lines
137};137};
138 138
139static const struct attribute_group w1_f3a_group = {139static const struct attribute_group w1_f3a_group = {
140 .bin_attrs_new = w1_f3a_bin_attrs,140 .bin_attrs = w1_f3a_bin_attrs,
141};141};
142 142
143static const struct attribute_group *w1_f3a_groups[] = {143static const struct attribute_group *w1_f3a_groups[] = {
drivers/w1/slaves/w1_ds2430.c+1−1
@@ -271,7 +271,7 @@ static const struct bin_attribute *const w1_f14_bin_attrs[] = { · 270 unmodified lines
271};271};
272 272
273static const struct attribute_group w1_f14_group = {273static const struct attribute_group w1_f14_group = {
274 .bin_attrs_new = w1_f14_bin_attrs,274 .bin_attrs = w1_f14_bin_attrs,
275};275};
276 276
277static const struct attribute_group *w1_f14_groups[] = {277static const struct attribute_group *w1_f14_groups[] = {
drivers/w1/slaves/w1_ds2431.c+1−1
@@ -270,7 +270,7 @@ static const struct bin_attribute *const w1_f2d_bin_attrs[] = { · 269 unmodified lines
270};270};
271 271
272static const struct attribute_group w1_f2d_group = {272static const struct attribute_group w1_f2d_group = {
273 .bin_attrs_new = w1_f2d_bin_attrs,273 .bin_attrs = w1_f2d_bin_attrs,
274};274};
275 275
276static const struct attribute_group *w1_f2d_groups[] = {276static const struct attribute_group *w1_f2d_groups[] = {
drivers/w1/slaves/w1_ds2433.c+2−2
@@ -294,7 +294,7 @@ static const struct bin_attribute *const w1_f23_bin_attributes[] = { · 293 unmodified lines
294};294};
295 295
296static const struct attribute_group w1_f23_group = {296static const struct attribute_group w1_f23_group = {
297 .bin_attrs_new = w1_f23_bin_attributes,297 .bin_attrs = w1_f23_bin_attributes,
298};298};
299 299
300static const struct attribute_group *w1_f23_groups[] = {300static const struct attribute_group *w1_f23_groups[] = {
@@ -308,7 +308,7 @@ static const struct bin_attribute *const w1_f43_bin_attributes[] = { · 7 unmodified lines
308};308};
309 309
310static const struct attribute_group w1_f43_group = {310static const struct attribute_group w1_f43_group = {
311 .bin_attrs_new = w1_f43_bin_attributes,311 .bin_attrs = w1_f43_bin_attributes,
312};312};
313 313
314static const struct attribute_group *w1_f43_groups[] = {314static const struct attribute_group *w1_f43_groups[] = {
drivers/w1/slaves/w1_ds2438.c+1−1
@@ -492,7 +492,7 @@ static const struct bin_attribute *const w1_ds2438_bin_attrs[] = { · 491 unmodified lines
492};492};
493 493
494static const struct attribute_group w1_ds2438_group = {494static const struct attribute_group w1_ds2438_group = {
495 .bin_attrs_new = w1_ds2438_bin_attrs,495 .bin_attrs = w1_ds2438_bin_attrs,
496};496};
497 497
498static const struct attribute_group *w1_ds2438_groups[] = {498static const struct attribute_group *w1_ds2438_groups[] = {
drivers/w1/slaves/w1_ds2780.c+1−1
@@ -103,7 +103,7 @@ static const struct bin_attribute *const w1_ds2780_bin_attrs[] = { · 102 unmodified lines
103};103};
104 104
105static const struct attribute_group w1_ds2780_group = {105static const struct attribute_group w1_ds2780_group = {
106 .bin_attrs_new = w1_ds2780_bin_attrs,106 .bin_attrs = w1_ds2780_bin_attrs,
107};107};
108 108
109static const struct attribute_group *w1_ds2780_groups[] = {109static const struct attribute_group *w1_ds2780_groups[] = {
drivers/w1/slaves/w1_ds2781.c+1−1
@@ -100,7 +100,7 @@ static const struct bin_attribute *const w1_ds2781_bin_attrs[] = { · 99 unmodified lines
100};100};
101 101
102static const struct attribute_group w1_ds2781_group = {102static const struct attribute_group w1_ds2781_group = {
103 .bin_attrs_new = w1_ds2781_bin_attrs,103 .bin_attrs = w1_ds2781_bin_attrs,
104};104};
105 105
106static const struct attribute_group *w1_ds2781_groups[] = {106static const struct attribute_group *w1_ds2781_groups[] = {
drivers/w1/slaves/w1_ds28e04.c+1−1
@@ -371,7 +371,7 @@ static const struct bin_attribute *const w1_f1C_bin_attrs[] = { · 370 unmodified lines
371 371
372static const struct attribute_group w1_f1C_group = {372static const struct attribute_group w1_f1C_group = {
373 .attrs = w1_f1C_attrs,373 .attrs = w1_f1C_attrs,
374 .bin_attrs_new = w1_f1C_bin_attrs,374 .bin_attrs = w1_f1C_bin_attrs,
375};375};
376 376
377static const struct attribute_group *w1_f1C_groups[] = {377static const struct attribute_group *w1_f1C_groups[] = {
drivers/w1/w1.c+1−1
@@ -149,7 +149,7 @@ static const struct bin_attribute *const w1_slave_bin_attrs[] = { · 148 unmodified lines
149};149};
150 150
151static const struct attribute_group w1_slave_default_group = {151static const struct attribute_group w1_slave_default_group = {
152 .bin_attrs_new = w1_slave_bin_attrs,152 .bin_attrs = w1_slave_bin_attrs,
153};153};
154 154
155static const struct attribute_group *w1_slave_default_groups[] = {155static const struct attribute_group *w1_slave_default_groups[] = {
drivers/zorro/zorro-sysfs.c+1−1
@@ -114,7 +114,7 @@ static const struct bin_attribute *const zorro_device_bin_attrs[] = { · 113 unmodified lines
114 114
115static const struct attribute_group zorro_device_attr_group = {115static const struct attribute_group zorro_device_attr_group = {
116 .attrs = zorro_device_attrs,116 .attrs = zorro_device_attrs,
117 .bin_attrs_new = zorro_device_bin_attrs,117 .bin_attrs = zorro_device_bin_attrs,
118};118};
119 119
120const struct attribute_group *zorro_device_attribute_groups[] = {120const struct attribute_group *zorro_device_attribute_groups[] = {
kernel/module/sysfs.c+5−5
@@ -56,9 +56,9 @@ static void free_sect_attrs(struct module_sect_attrs *sect_attrs) · 55 unmodified lines
56{56{
57 const struct bin_attribute *const *bin_attr;57 const struct bin_attribute *const *bin_attr;
58 58
59 for (bin_attr = sect_attrs->grp.bin_attrs_new; *bin_attr; bin_attr++)59 for (bin_attr = sect_attrs->grp.bin_attrs; *bin_attr; bin_attr++)
60 kfree((*bin_attr)->attr.name);60 kfree((*bin_attr)->attr.name);
61 kfree(sect_attrs->grp.bin_attrs_new);61 kfree(sect_attrs->grp.bin_attrs);
62 kfree(sect_attrs);62 kfree(sect_attrs);
63}63}
64 64
@@ -86,7 +86,7 @@ static int add_sect_attrs(struct module *mod, const struct load_info *info) · 21 unmodified lines
86 86
87 /* Setup section attributes. */87 /* Setup section attributes. */
88 sect_attrs->grp.name = "sections";88 sect_attrs->grp.name = "sections";
89 sect_attrs->grp.bin_attrs_new = gattr;89 sect_attrs->grp.bin_attrs = gattr;
90 90
91 sattr = &sect_attrs->attrs[0];91 sattr = &sect_attrs->attrs[0];
92 for (i = 0; i < info->hdr->e_shnum; i++) {92 for (i = 0; i < info->hdr->e_shnum; i++) {
@@ -144,7 +144,7 @@ struct module_notes_attrs { · 51 unmodified lines
144 144
145static void free_notes_attrs(struct module_notes_attrs *notes_attrs)145static void free_notes_attrs(struct module_notes_attrs *notes_attrs)
146{146{
147 kfree(notes_attrs->grp.bin_attrs_new);147 kfree(notes_attrs->grp.bin_attrs);
148 kfree(notes_attrs);148 kfree(notes_attrs);
149}149}
150 150
@@ -178,7 +178,7 @@ static int add_notes_attrs(struct module *mod, const struct load_info *info) · 27 unmodified lines
178 }178 }
179 179
180 notes_attrs->grp.name = "notes";180 notes_attrs->grp.name = "notes";
181 notes_attrs->grp.bin_attrs_new = gattr;181 notes_attrs->grp.bin_attrs = gattr;
182 182
183 nattr = &notes_attrs->attrs[0];183 nattr = &notes_attrs->attrs[0];
184 for (loaded = i = 0; i < info->hdr->e_shnum; ++i) {184 for (loaded = i = 0; i < info->hdr->e_shnum; ++i) {
mm/page_idle.c+1−1
@@ -208,7 +208,7 @@ static const struct bin_attribute *const page_idle_bin_attrs[] = { · 207 unmodified lines
208};208};
209 209
210static const struct attribute_group page_idle_attr_group = {210static const struct attribute_group page_idle_attr_group = {
211 .bin_attrs_new = page_idle_bin_attrs,211 .bin_attrs = page_idle_bin_attrs,
212 .name = "page_idle",212 .name = "page_idle",
213};213};
214 214