From nobody Wed Feb 11 05:28:56 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F44A1DE4FB for ; Fri, 30 May 2025 04:03:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577813; cv=none; b=DwXsq90uHdDxqXnYKBwpv2N+HUItM6sYv/EXTi7yKnm7lSIYcp83BryJagXen8OImcLKxAMDH/w/F9/dNghfyMeY01D+j96nQAaomxYu9i2lqiawzBQFmGL4z9nWvrYp31RNjZXD6970n2jZ9l7Px2yOjQpyJ1gZ1G3+GJDbDaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577813; c=relaxed/simple; bh=CD0obRXJmMo/kbz+YuICHAhtmHJJZY0oVXFlpKVP8Mk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=mvJmso6ZZo8vp5JbCDmyuYAhm7yo9B7aZ81YjJj+ugSpuVT6kGmNWO2mIz0XRImlwzJrqazAO4AuX4Ga0suxxTeU6QbpXY7agmkGmA8r0DaNBUsTY7ffq8d/z2GNCu9FfWTASjg9VPkW4qRIxexKxElPgk0/uysiQQu9RJA5YjY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=KsSOHvCz; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="KsSOHvCz" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1748577803; bh=CD0obRXJmMo/kbz+YuICHAhtmHJJZY0oVXFlpKVP8Mk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=KsSOHvCzRobiX0n6rDkyru5ujpYXFEKrCq5x1wSNS5+CQAU4qUBEra3NXdG69ptoD 2Qm+OP/iHc7K6wc7kjyl1ODjByYje3uDSC1jbCqFJNUExEjUffTtmDEPvTDwO6INdl xizgi+5pA8lhtnCcxheE6JfhfsAQn6SFpfq4q7uE= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Fri, 30 May 2025 05:54:35 +0200 Subject: [PATCH v3 1/6] const_structs.checkpatch: add bin_attribute Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250530-sysfs-const-bin_attr-final-v3-1-724bfcf05b99@weissschuh.net> References: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> In-Reply-To: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich Cc: linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1748577802; l=693; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=CD0obRXJmMo/kbz+YuICHAhtmHJJZY0oVXFlpKVP8Mk=; b=alnqOyt/k01FWMuh4m7FSLenjWDB+J4/iEAp0Z4jVDzX8+XJgIRn5rNjSs9XhHpT2cSj3AwSB xPmavmeQe8aAD47dqFw2utCWYR/IycQxDCQTnu1Zpur0nZVhPLGQAnL X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= Now that the sysfs core can handle "const struct bin_attribute", make sure that new usages of the struct already enter the tree as const. Signed-off-by: Thomas Wei=C3=9Fschuh --- scripts/const_structs.checkpatch | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/const_structs.checkpatch b/scripts/const_structs.check= patch index e8609a03c3d8b5be4ec05eeda83c47ffc3feb646..6eb94fddc338a211a2aac9cb6e4= cd9d15c4b4a6c 100644 --- a/scripts/const_structs.checkpatch +++ b/scripts/const_structs.checkpatch @@ -1,6 +1,7 @@ acpi_dock_ops address_space_operations backlight_ops +bin_attribute block_device_operations bus_type clk_ops --=20 2.49.0 From nobody Wed Feb 11 05:28:56 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 37ADB194137 for ; Fri, 30 May 2025 04:03:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577813; cv=none; b=TQYMzSWxNm7mCcuCWt2h0+NgKPjybX8VAXqWYHv96F2dwTAsi1TQSbq0Y41OgmrCI8ahEJMuDgKZQNqdvguwwus2m4NH0ewiejkxFBZZQRH1Xj9j4zo6EEmTYLJyZWmQyb4MjUIxjXR/4mrWAQawi5UfrFlLwNLlCNIs4UP/g5Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577813; c=relaxed/simple; bh=vJfQr+x8KcSc0cwW5bUrVaygxzJThrqrxrjFIPXKgkA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=uKb3cqcMbjubGfQmFY5fXgi2zYiWjZxaQYCfQb3om0Lx5bmiYKkiJBwxjXQBjKTu0MAg3HAApkU9AshuPA/7+o2PtA2VX7YAeEkXVi2wZzxUEJzOlYvQuA0rqeF73OCZcBVzX9PM+S+1kJIferPQADYT1Vyfz/7TNf/o8Tg9hcs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=SIRUBz6B; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="SIRUBz6B" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1748577803; bh=vJfQr+x8KcSc0cwW5bUrVaygxzJThrqrxrjFIPXKgkA=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=SIRUBz6BQRzKn0XO05bD+SQWeHSfPAqSbtuYbPXXby2Jik2w0qU7QZZhbGsNmV4OS ECsxvIx9o4BE7U4lHxpMkMf4fqfc0Hv9eAibCoopM1UlBco64U9v5noLuPFXH5uin1 YyXic3843BDOchC6Q2b5RjaMRz48tAkIf5ah6Il0= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Fri, 30 May 2025 05:54:36 +0200 Subject: [PATCH v3 2/6] sysfs: constify internal references to 'struct bin_attribute' Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250530-sysfs-const-bin_attr-final-v3-2-724bfcf05b99@weissschuh.net> References: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> In-Reply-To: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich Cc: linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1748577802; l=2344; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=vJfQr+x8KcSc0cwW5bUrVaygxzJThrqrxrjFIPXKgkA=; b=CjPIeKpuE00zzKB+nwSGb7i3uE0PTHxaEc5MA8+SsTIKiqe7dk71caaDWJLq0ESMnhprXwRF7 IHEabwIjrIXDSYE8WaSnY++Xxu+RxedV65uAdHzalsR1EaIg7lov8wO X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= The sysfs core handles 'const struct bin_attribute *'. Adapt the internal references. Signed-off-by: Thomas Wei=C3=9Fschuh --- fs/sysfs/file.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index c3d3b079aedde7ca5318328fe853ccf891d663e9..1ca143d2f22ad2d6b0b74b26151= 4f8bc3cb5153c 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -83,7 +83,7 @@ static int sysfs_kf_seq_show(struct seq_file *sf, void *v) static ssize_t sysfs_kf_bin_read(struct kernfs_open_file *of, char *buf, size_t count, loff_t pos) { - struct bin_attribute *battr =3D of->kn->priv; + const struct bin_attribute *battr =3D of->kn->priv; struct kobject *kobj =3D sysfs_file_kobj(of->kn); loff_t size =3D file_inode(of->file)->i_size; =20 @@ -149,7 +149,7 @@ static ssize_t sysfs_kf_write(struct kernfs_open_file *= of, char *buf, static ssize_t sysfs_kf_bin_write(struct kernfs_open_file *of, char *buf, size_t count, loff_t pos) { - struct bin_attribute *battr =3D of->kn->priv; + const struct bin_attribute *battr =3D of->kn->priv; struct kobject *kobj =3D sysfs_file_kobj(of->kn); loff_t size =3D file_inode(of->file)->i_size; =20 @@ -173,7 +173,7 @@ static ssize_t sysfs_kf_bin_write(struct kernfs_open_fi= le *of, char *buf, static int sysfs_kf_bin_mmap(struct kernfs_open_file *of, struct vm_area_struct *vma) { - struct bin_attribute *battr =3D of->kn->priv; + const struct bin_attribute *battr =3D of->kn->priv; struct kobject *kobj =3D sysfs_file_kobj(of->kn); =20 return battr->mmap(of->file, kobj, battr, vma); @@ -182,7 +182,7 @@ static int sysfs_kf_bin_mmap(struct kernfs_open_file *o= f, static loff_t sysfs_kf_bin_llseek(struct kernfs_open_file *of, loff_t offs= et, int whence) { - struct bin_attribute *battr =3D of->kn->priv; + const struct bin_attribute *battr =3D of->kn->priv; struct kobject *kobj =3D sysfs_file_kobj(of->kn); =20 if (battr->llseek) @@ -193,7 +193,7 @@ static loff_t sysfs_kf_bin_llseek(struct kernfs_open_fi= le *of, loff_t offset, =20 static int sysfs_kf_bin_open(struct kernfs_open_file *of) { - struct bin_attribute *battr =3D of->kn->priv; + const struct bin_attribute *battr =3D of->kn->priv; =20 if (battr->f_mapping) of->file->f_mapping =3D battr->f_mapping(); --=20 2.49.0 From nobody Wed Feb 11 05:28:56 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F4F91DE896 for ; Fri, 30 May 2025 04:03:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577815; cv=none; b=KI0wJepw+uN8EYzS6OpB2ggi5KU8KN/FKCjEJrVblwOK89nbKftqLOb3TcjRAetWAQEENYRIm++4DBDNhF9/rJy+yz+wByTPHuD61UUYA5LAXvKzPvBENkKPDzcJK6YNECbzOfAtgQHHTXmp9E2+imtFnagMmvSbWqvU7C1aJO4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577815; c=relaxed/simple; bh=SBvYM3WpXfTQ228A4WE6PNn3tmnFBf2F/MM69M5Z5HU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fAj0Qc9GUUDBARIKzr9Fbyu1ldloNfjA9nqQK/cVAx93nymwAua3jPllTzpHZolVlkdzMWtecly5huNuVJEUDXg9/9rO9UvZRRaVITj0EW9leWtrug3cqsYbXFvWcYzO0zxlvchUXdsDmZU4YW316FDBGIqgb0irVei/YyeG+UU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=K+769GzU; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="K+769GzU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1748577803; bh=SBvYM3WpXfTQ228A4WE6PNn3tmnFBf2F/MM69M5Z5HU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=K+769GzUe/wCY1NxKsruvuTzkR7H689bOzO6yVbzNBSO8h9b0msQnCnq4ZmxGj9JD vOCEaoXy8YeUnsvca4TgNJpbfFUB0KUTHw5EjWSvrDAwsaMY2vR5anpIFnyxTKbenv JH05gnXItHYhE7PtmhT5SEEz1B8SbDhi3lJ15OYc= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Fri, 30 May 2025 05:54:37 +0200 Subject: [PATCH v3 3/6] sysfs: treewide: switch back to bin_attribute::read()/write() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250530-sysfs-const-bin_attr-final-v3-3-724bfcf05b99@weissschuh.net> References: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> In-Reply-To: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich Cc: linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1748577802; l=69706; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=SBvYM3WpXfTQ228A4WE6PNn3tmnFBf2F/MM69M5Z5HU=; b=2Dn9G1CnTMLoLPiLJRy5AiF1KXux1e3JgJIiaCm1Z+03uBcXCZu+l51ft7JV/EBoFyj5s3Twn CAKnJqE2X8YDm/IXhYY10yDiRfQBTdooV1N1K/w7qystxUSImM/l8As X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= The bin_attribute argument of bin_attribute::read() is now const. This makes the _new() callbacks unnecessary. Switch all users back. Signed-off-by: Thomas Wei=C3=9Fschuh --- arch/powerpc/platforms/powernv/opal-core.c | 2 +- arch/powerpc/platforms/powernv/opal-dump.c | 2 +- arch/powerpc/platforms/powernv/opal-elog.c | 2 +- arch/powerpc/platforms/powernv/opal-flash.c | 2 +- arch/powerpc/platforms/powernv/opal-msglog.c | 2 +- arch/powerpc/platforms/powernv/opal.c | 2 +- arch/powerpc/platforms/powernv/ultravisor.c | 2 +- arch/x86/kernel/ksysfs.c | 4 +-- drivers/accel/habanalabs/common/sysfs.c | 2 +- drivers/acpi/sysfs.c | 4 +-- drivers/base/firmware_loader/sysfs.c | 4 +-- drivers/firmware/efi/mokvar-table.c | 2 +- drivers/firmware/google/gsmi.c | 2 +- drivers/firmware/google/memconsole.c | 2 +- drivers/firmware/google/vpd.c | 4 +-- drivers/firmware/qemu_fw_cfg.c | 2 +- drivers/fsi/fsi-core.c | 4 +-- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 +-- .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 4 +-- drivers/gpu/drm/drm_sysfs.c | 2 +- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +-- drivers/gpu/drm/i915/i915_sysfs.c | 8 ++--- drivers/gpu/drm/lima/lima_drv.c | 4 +-- drivers/hid/hid-roccat-common.h | 8 ++--- drivers/hid/hid-roccat-isku.c | 8 ++--- drivers/hid/hid-roccat-kone.c | 4 +-- drivers/hid/hid-roccat-koneplus.c | 12 ++++---- drivers/hid/hid-roccat-kovaplus.c | 10 +++---- drivers/hid/hid-roccat-lua.c | 4 +-- drivers/hid/hid-roccat-pyra.c | 12 ++++---- drivers/i2c/i2c-slave-eeprom.c | 4 +-- drivers/media/pci/solo6x10/solo6x10-core.c | 2 +- drivers/misc/ds1682.c | 4 +-- drivers/misc/eeprom/max6875.c | 2 +- drivers/misc/ocxl/sysfs.c | 2 +- drivers/misc/pch_phub.c | 4 +-- drivers/misc/sram.c | 4 +-- .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 10 +++---- drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 34 +++++++++++-------= ---- drivers/net/phy/spi_ks8995.c | 4 +-- drivers/net/wireless/ti/wlcore/sysfs.c | 2 +- drivers/nvmem/core.c | 10 +++---- drivers/of/kobj.c | 2 +- drivers/pci/hotplug/acpiphp_ibm.c | 2 +- drivers/pci/pci-sysfs.c | 8 ++--- drivers/pcmcia/cistpl.c | 4 +-- drivers/platform/mellanox/mlxbf-bootctl.c | 2 +- drivers/platform/x86/amd/hsmp/acpi.c | 2 +- drivers/platform/x86/amd/hsmp/plat.c | 2 +- drivers/platform/x86/intel/pmt/class.c | 2 +- drivers/power/supply/ds2780_battery.c | 8 ++--- drivers/power/supply/ds2781_battery.c | 8 ++--- drivers/power/supply/olpc_battery.c | 2 +- drivers/rapidio/rio-sysfs.c | 4 +-- drivers/s390/char/sclp_config.c | 2 +- drivers/s390/char/sclp_sd.c | 2 +- drivers/scsi/3w-sas.c | 4 +-- drivers/scsi/arcmsr/arcmsr_attr.c | 6 ++-- drivers/scsi/esas2r/esas2r_main.c | 6 ++-- drivers/scsi/ibmvscsi/ibmvfc.c | 2 +- drivers/scsi/ipr.c | 10 +++---- drivers/scsi/lpfc/lpfc_attr.c | 8 ++--- drivers/scsi/qedf/qedf_attr.c | 4 +-- drivers/scsi/qla2xxx/qla_attr.c | 28 +++++++++--------- drivers/scsi/qla4xxx/ql4_attr.c | 4 +-- drivers/scsi/scsi_sysfs.c | 4 +-- drivers/video/fbdev/aty/radeon_base.c | 4 +-- drivers/video/fbdev/udlfb.c | 4 +-- drivers/virt/coco/guest/tsm-mr.c | 4 +-- drivers/w1/slaves/w1_ds2406.c | 4 +-- drivers/w1/slaves/w1_ds2433.c | 8 ++--- drivers/w1/slaves/w1_ds2805.c | 4 +-- drivers/zorro/zorro-sysfs.c | 2 +- kernel/bpf/btf.c | 2 +- kernel/bpf/sysfs_btf.c | 2 +- kernel/module/sysfs.c | 4 +-- net/bridge/br_sysfs_br.c | 2 +- 77 files changed, 188 insertions(+), 188 deletions(-) diff --git a/arch/powerpc/platforms/powernv/opal-core.c b/arch/powerpc/plat= forms/powernv/opal-core.c index e652da8f986f0355583c9c3ebde187814c1c7224..6fe121aae4053d3f28fe07e12a3= 219e2e79758ad 100644 --- a/arch/powerpc/platforms/powernv/opal-core.c +++ b/arch/powerpc/platforms/powernv/opal-core.c @@ -208,7 +208,7 @@ static ssize_t read_opalcore(struct file *file, struct = kobject *kobj, =20 static struct bin_attribute opal_core_attr __ro_after_init =3D { .attr =3D {.name =3D "core", .mode =3D 0400}, - .read_new =3D read_opalcore + .read =3D read_opalcore }; =20 /* diff --git a/arch/powerpc/platforms/powernv/opal-dump.c b/arch/powerpc/plat= forms/powernv/opal-dump.c index 27e25693cf3990e4f53687d38355c4f4c0a7d8c5..cc3cc9ddf9d1876b326f3285775= d20d0d5b15323 100644 --- a/arch/powerpc/platforms/powernv/opal-dump.c +++ b/arch/powerpc/platforms/powernv/opal-dump.c @@ -342,7 +342,7 @@ static void create_dump_obj(uint32_t id, size_t size, u= int32_t type) dump->dump_attr.attr.name =3D "dump"; dump->dump_attr.attr.mode =3D 0400; dump->dump_attr.size =3D size; - dump->dump_attr.read_new =3D dump_attr_read; + dump->dump_attr.read =3D dump_attr_read; =20 dump->id =3D id; dump->size =3D size; diff --git a/arch/powerpc/platforms/powernv/opal-elog.c b/arch/powerpc/plat= forms/powernv/opal-elog.c index de33f354e9fdd1440f39407aecf1e7085e9b52df..c3fc5d2581460e7e52d6b82015b= eb25be5089ba1 100644 --- a/arch/powerpc/platforms/powernv/opal-elog.c +++ b/arch/powerpc/platforms/powernv/opal-elog.c @@ -203,7 +203,7 @@ static void create_elog_obj(uint64_t id, size_t size, u= int64_t type) elog->raw_attr.attr.name =3D "raw"; elog->raw_attr.attr.mode =3D 0400; elog->raw_attr.size =3D size; - elog->raw_attr.read_new =3D raw_attr_read; + elog->raw_attr.read =3D raw_attr_read; =20 elog->id =3D id; elog->size =3D size; diff --git a/arch/powerpc/platforms/powernv/opal-flash.c b/arch/powerpc/pla= tforms/powernv/opal-flash.c index fd8c8621e97340cdf5570d72ce82f86516cb2786..a3f7a2928767f98c809f230275a= cb617f64ad45d 100644 --- a/arch/powerpc/platforms/powernv/opal-flash.c +++ b/arch/powerpc/platforms/powernv/opal-flash.c @@ -493,7 +493,7 @@ static ssize_t image_data_write(struct file *filp, stru= ct kobject *kobj, static const struct bin_attribute image_data_attr =3D { .attr =3D {.name =3D "image", .mode =3D 0200}, .size =3D MAX_IMAGE_SIZE, /* Limit image size */ - .write_new =3D image_data_write, + .write =3D image_data_write, }; =20 static struct kobj_attribute validate_attribute =3D diff --git a/arch/powerpc/platforms/powernv/opal-msglog.c b/arch/powerpc/pl= atforms/powernv/opal-msglog.c index f1988d0ab45ce49f09f47c9e8859cc5dfcee3a6d..992a6b379a66a7071e60557ed69= d2112f85b9e24 100644 --- a/arch/powerpc/platforms/powernv/opal-msglog.c +++ b/arch/powerpc/platforms/powernv/opal-msglog.c @@ -102,7 +102,7 @@ static ssize_t opal_msglog_read(struct file *file, stru= ct kobject *kobj, =20 static struct bin_attribute opal_msglog_attr __ro_after_init =3D { .attr =3D {.name =3D "msglog", .mode =3D 0400}, - .read_new =3D opal_msglog_read + .read =3D opal_msglog_read }; =20 struct memcons *__init memcons_init(struct device_node *node, const char *= mc_prop_name) diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms= /powernv/opal.c index 9ec265fcaff4e2713f3fbb823bbfefd211fd3afd..09bd93464b4f72b901baf791131= 9f38b7874b265 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c @@ -815,7 +815,7 @@ static int opal_add_one_export(struct kobject *parent, = const char *export_name, sysfs_bin_attr_init(attr); attr->attr.name =3D name; attr->attr.mode =3D 0400; - attr->read_new =3D sysfs_bin_attr_simple_read; + attr->read =3D sysfs_bin_attr_simple_read; attr->private =3D __va(vals[0]); attr->size =3D vals[1]; =20 diff --git a/arch/powerpc/platforms/powernv/ultravisor.c b/arch/powerpc/pla= tforms/powernv/ultravisor.c index 157d9a8134e445ed22be8ae58ff9181b45ac7ff0..c526871a1229b1b5f524ab1ad65= 567f920b31c8d 100644 --- a/arch/powerpc/platforms/powernv/ultravisor.c +++ b/arch/powerpc/platforms/powernv/ultravisor.c @@ -40,7 +40,7 @@ static ssize_t uv_msglog_read(struct file *file, struct k= object *kobj, =20 static struct bin_attribute uv_msglog_attr __ro_after_init =3D { .attr =3D {.name =3D "msglog", .mode =3D 0400}, - .read_new =3D uv_msglog_read + .read =3D uv_msglog_read }; =20 static int __init uv_init(void) diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c index b68d4be9464efab13b808fd69092003a89b5612b..4ee7fd9dd69c46cf9a0e9205585= d3f898122db96 100644 --- a/arch/x86/kernel/ksysfs.c +++ b/arch/x86/kernel/ksysfs.c @@ -40,7 +40,7 @@ static const struct bin_attribute boot_params_data_attr = =3D { .name =3D "data", .mode =3D S_IRUGO, }, - .read_new =3D boot_params_data_read, + .read =3D boot_params_data_read, .size =3D sizeof(boot_params), }; =20 @@ -250,7 +250,7 @@ static struct bin_attribute data_attr __ro_after_init = =3D { .name =3D "data", .mode =3D S_IRUGO, }, - .read_new =3D setup_data_data_read, + .read =3D setup_data_data_read, }; =20 static struct attribute *setup_data_type_attrs[] =3D { diff --git a/drivers/accel/habanalabs/common/sysfs.c b/drivers/accel/habana= labs/common/sysfs.c index 9d58efa2ff380c8773bd79bea613dc79a5a98020..678585cfef848b4222aac82c80a= 7d39a4148efb2 100644 --- a/drivers/accel/habanalabs/common/sysfs.c +++ b/drivers/accel/habanalabs/common/sysfs.c @@ -446,7 +446,7 @@ static DEVICE_ATTR_RO(parent_device); static const struct bin_attribute bin_attr_eeprom =3D { .attr =3D {.name =3D "eeprom", .mode =3D (0444)}, .size =3D PAGE_SIZE, - .read_new =3D eeprom_read_handler + .read =3D eeprom_read_handler }; =20 static struct attribute *hl_dev_attrs[] =3D { diff --git a/drivers/acpi/sysfs.c b/drivers/acpi/sysfs.c index a48ebbf768f91ab354cd276f1b4dda2c063ef9b5..e596224302f4c833103001d7d8b= ee636db140ad6 100644 --- a/drivers/acpi/sysfs.c +++ b/drivers/acpi/sysfs.c @@ -372,7 +372,7 @@ static int acpi_table_attr_init(struct kobject *tables_= obj, } =20 table_attr->attr.size =3D table_header->length; - table_attr->attr.read_new =3D acpi_table_show; + table_attr->attr.read =3D acpi_table_show; table_attr->attr.attr.name =3D table_attr->filename; table_attr->attr.attr.mode =3D 0400; =20 @@ -495,7 +495,7 @@ static int acpi_table_data_init(struct acpi_table_heade= r *th) if (!data_attr) return -ENOMEM; sysfs_attr_init(&data_attr->attr.attr); - data_attr->attr.read_new =3D acpi_data_show; + data_attr->attr.read =3D acpi_data_show; data_attr->attr.attr.mode =3D 0400; return acpi_data_objs[i].fn(th, data_attr); } diff --git a/drivers/base/firmware_loader/sysfs.c b/drivers/base/firmware_l= oader/sysfs.c index d254ceb56d8434e80085dcb4fdef2752582cdab8..c9b1564616f451d3913f2a3d07a= 2b20ffe2e39f3 100644 --- a/drivers/base/firmware_loader/sysfs.c +++ b/drivers/base/firmware_loader/sysfs.c @@ -359,8 +359,8 @@ static ssize_t firmware_data_write(struct file *filp, s= truct kobject *kobj, static const struct bin_attribute firmware_attr_data =3D { .attr =3D { .name =3D "data", .mode =3D 0644 }, .size =3D 0, - .read_new =3D firmware_data_read, - .write_new =3D firmware_data_write, + .read =3D firmware_data_read, + .write =3D firmware_data_write, }; =20 static struct attribute *fw_dev_attrs[] =3D { diff --git a/drivers/firmware/efi/mokvar-table.c b/drivers/firmware/efi/mok= var-table.c index 0a856c3f69a3ff94b3be928a6238077a09b5dc6a..aedbbd627706a1a8bb1d9aa8d75= 93d99a3764080 100644 --- a/drivers/firmware/efi/mokvar-table.c +++ b/drivers/firmware/efi/mokvar-table.c @@ -340,7 +340,7 @@ static int __init efi_mokvar_sysfs_init(void) mokvar_sysfs->bin_attr.attr.name =3D mokvar_entry->name; mokvar_sysfs->bin_attr.attr.mode =3D 0400; mokvar_sysfs->bin_attr.size =3D mokvar_entry->data_size; - mokvar_sysfs->bin_attr.read_new =3D efi_mokvar_sysfs_read; + mokvar_sysfs->bin_attr.read =3D efi_mokvar_sysfs_read; =20 err =3D sysfs_create_bin_file(mokvar_kobj, &mokvar_sysfs->bin_attr); diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c index e8fb00dcaf65bc593dd15562f20aeea482ccfc3e..0ceccde5a3026696067c3e24782= 0e7f42806cc19 100644 --- a/drivers/firmware/google/gsmi.c +++ b/drivers/firmware/google/gsmi.c @@ -530,7 +530,7 @@ static ssize_t eventlog_write(struct file *filp, struct= kobject *kobj, =20 static const struct bin_attribute eventlog_bin_attr =3D { .attr =3D {.name =3D "append_to_eventlog", .mode =3D 0200}, - .write_new =3D eventlog_write, + .write =3D eventlog_write, }; =20 static ssize_t gsmi_clear_eventlog_store(struct kobject *kobj, diff --git a/drivers/firmware/google/memconsole.c b/drivers/firmware/google= /memconsole.c index d957af6f934984b74627e83f458575dbf2b7d592..6138a1653ec57caf7b7e4b37afa= 45f86651d8985 100644 --- a/drivers/firmware/google/memconsole.c +++ b/drivers/firmware/google/memconsole.c @@ -28,7 +28,7 @@ static ssize_t memconsole_read(struct file *filp, struct = kobject *kobp, =20 static struct bin_attribute memconsole_bin_attr =3D { .attr =3D {.name =3D "log", .mode =3D 0444}, - .read_new =3D memconsole_read, + .read =3D memconsole_read, }; =20 void memconsole_setup(ssize_t (*read_func)(char *, loff_t, size_t)) diff --git a/drivers/firmware/google/vpd.c b/drivers/firmware/google/vpd.c index 254ac6545d680ac099ae2efa3c2109c9eb8c41be..339a3f74b24721700dbad823474= 90cdb3eaad724 100644 --- a/drivers/firmware/google/vpd.c +++ b/drivers/firmware/google/vpd.c @@ -121,7 +121,7 @@ static int vpd_section_attrib_add(const u8 *key, u32 ke= y_len, info->bin_attr.attr.name =3D info->key; info->bin_attr.attr.mode =3D 0444; info->bin_attr.size =3D value_len; - info->bin_attr.read_new =3D vpd_attrib_read; + info->bin_attr.read =3D vpd_attrib_read; info->bin_attr.private =3D info; =20 info->value =3D value; @@ -201,7 +201,7 @@ static int vpd_section_init(const char *name, struct vp= d_section *sec, sec->bin_attr.attr.name =3D sec->raw_name; sec->bin_attr.attr.mode =3D 0444; sec->bin_attr.size =3D size; - sec->bin_attr.read_new =3D vpd_section_read; + sec->bin_attr.read =3D vpd_section_read; sec->bin_attr.private =3D sec; =20 err =3D sysfs_create_bin_file(vpd_kobj, &sec->bin_attr); diff --git a/drivers/firmware/qemu_fw_cfg.c b/drivers/firmware/qemu_fw_cfg.c index 2615fb780e3c4500db36d4746880455f05479f1f..0eebd572f9a54d1dead9feefa10= 84de4da0a2ec8 100644 --- a/drivers/firmware/qemu_fw_cfg.c +++ b/drivers/firmware/qemu_fw_cfg.c @@ -476,7 +476,7 @@ static ssize_t fw_cfg_sysfs_read_raw(struct file *filp,= struct kobject *kobj, =20 static const struct bin_attribute fw_cfg_sysfs_attr_raw =3D { .attr =3D { .name =3D "raw", .mode =3D S_IRUSR }, - .read_new =3D fw_cfg_sysfs_read_raw, + .read =3D fw_cfg_sysfs_read_raw, }; =20 /* diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index 50e8736039fe686dd402ecf8fabe37a4c237d71b..d303939e0b901f09c5751f3d72e= 8574dddea65c0 100644 --- a/drivers/fsi/fsi-core.c +++ b/drivers/fsi/fsi-core.c @@ -613,8 +613,8 @@ static const struct bin_attribute fsi_slave_raw_attr = =3D { .mode =3D 0600, }, .size =3D 0, - .read_new =3D fsi_slave_sysfs_raw_read, - .write_new =3D fsi_slave_sysfs_raw_write, + .read =3D fsi_slave_sysfs_raw_read, + .write =3D fsi_slave_sysfs_raw_write, }; =20 static void fsi_slave_release(struct device *dev) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_psp.c index e6f0b035e20b22e111a7396f6d78ae9b922cd223..be9f03bbcb36c5a6c7a355c677c= 3b6f4c255f96f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -4117,8 +4117,8 @@ static ssize_t amdgpu_psp_vbflash_read(struct file *f= ilp, struct kobject *kobj, static const struct bin_attribute psp_vbflash_bin_attr =3D { .attr =3D {.name =3D "psp_vbflash", .mode =3D 0660}, .size =3D 0, - .write_new =3D amdgpu_psp_vbflash_write, - .read_new =3D amdgpu_psp_vbflash_read, + .write =3D amdgpu_psp_vbflash_write, + .read =3D amdgpu_psp_vbflash_read, }; =20 /** diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c b/drive= rs/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c index c16962256514eba5b5146ffcf61799c3140c3568..b1d1897f5eaf16cc14d6efdc89a= 84265dbc5b114 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c @@ -723,8 +723,8 @@ static ssize_t srm_data_read(struct file *filp, struct = kobject *kobj, static const struct bin_attribute data_attr =3D { .attr =3D {.name =3D "hdcp_srm", .mode =3D 0664}, .size =3D PSP_HDCP_SRM_FIRST_GEN_MAX_SIZE, /* Limit SRM size */ - .write_new =3D srm_data_write, - .read_new =3D srm_data_read, + .write =3D srm_data_write, + .read =3D srm_data_read, }; =20 struct hdcp_workqueue *hdcp_create_workqueue(struct amdgpu_device *adev, diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 60c1f26edb6fad23153c32a29fd3be02700fc938..8d27ba7f0d83bcb5d32789cf46b= 4beec5a5715f6 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -319,7 +319,7 @@ static const struct bin_attribute edid_attr =3D { .attr.name =3D "edid", .attr.mode =3D 0444, .size =3D 0, - .read_new =3D edid_show, + .read =3D edid_show, }; =20 static const struct bin_attribute *const connector_bin_attrs[] =3D { diff --git a/drivers/gpu/drm/i915/i915_gpu_error.c b/drivers/gpu/drm/i915/i= 915_gpu_error.c index 4f785cdbd1553a7a033a5c4b87b16d616e196d88..568525d49428ed8756f54720d15= b897d9e7f3afc 100644 --- a/drivers/gpu/drm/i915/i915_gpu_error.c +++ b/drivers/gpu/drm/i915/i915_gpu_error.c @@ -2506,8 +2506,8 @@ static const struct bin_attribute error_state_attr = =3D { .attr.name =3D "error", .attr.mode =3D S_IRUSR | S_IWUSR, .size =3D 0, - .read_new =3D error_state_read, - .write_new =3D error_state_write, + .read =3D error_state_read, + .write =3D error_state_write, }; =20 void i915_gpu_error_sysfs_setup(struct drm_i915_private *i915) diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_= sysfs.c index f936e8f1f12942287a5a7d6aa7db6ed3a4c28281..622c66666935505112e46e1f4db= 5c984e63b3c56 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -140,8 +140,8 @@ i915_l3_write(struct file *filp, struct kobject *kobj, static const struct bin_attribute dpf_attrs =3D { .attr =3D {.name =3D "l3_parity", .mode =3D (S_IRUSR | S_IWUSR)}, .size =3D GEN7_L3LOG_SIZE, - .read_new =3D i915_l3_read, - .write_new =3D i915_l3_write, + .read =3D i915_l3_read, + .write =3D i915_l3_write, .mmap =3D NULL, .private =3D (void *)0 }; @@ -149,8 +149,8 @@ static const struct bin_attribute dpf_attrs =3D { static const struct bin_attribute dpf_attrs_1 =3D { .attr =3D {.name =3D "l3_parity_slice_1", .mode =3D (S_IRUSR | S_IWUSR)}, .size =3D GEN7_L3LOG_SIZE, - .read_new =3D i915_l3_read, - .write_new =3D i915_l3_write, + .read =3D i915_l3_read, + .write =3D i915_l3_write, .mmap =3D NULL, .private =3D (void *)1 }; diff --git a/drivers/gpu/drm/lima/lima_drv.c b/drivers/gpu/drm/lima/lima_dr= v.c index 11ace5cebf4c81b5d863efb0ad13dfcfc2373f7a..65210ab081bbac56cc1f2632941= 806a621223673 100644 --- a/drivers/gpu/drm/lima/lima_drv.c +++ b/drivers/gpu/drm/lima/lima_drv.c @@ -362,8 +362,8 @@ static const struct bin_attribute lima_error_state_attr= =3D { .attr.name =3D "error", .attr.mode =3D 0600, .size =3D 0, - .read_new =3D lima_error_state_read, - .write_new =3D lima_error_state_write, + .read =3D lima_error_state_read, + .write =3D lima_error_state_write, }; =20 static int lima_pdev_probe(struct platform_device *pdev) diff --git a/drivers/hid/hid-roccat-common.h b/drivers/hid/hid-roccat-commo= n.h index 0f9a2db04df96aaa2fe87adc00ec14f8fa30ed82..e931d0b48efe2991faec32d526a= 058f287d41380 100644 --- a/drivers/hid/hid-roccat-common.h +++ b/drivers/hid/hid-roccat-common.h @@ -71,8 +71,8 @@ ROCCAT_COMMON2_SYSFS_RW(thingy, COMMAND, SIZE); \ static const struct bin_attribute bin_attr_ ## thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0660 }, \ .size =3D SIZE, \ - .read_new =3D roccat_common2_sysfs_read_ ## thingy, \ - .write_new =3D roccat_common2_sysfs_write_ ## thingy \ + .read =3D roccat_common2_sysfs_read_ ## thingy, \ + .write =3D roccat_common2_sysfs_write_ ## thingy \ } =20 #define ROCCAT_COMMON2_BIN_ATTRIBUTE_R(thingy, COMMAND, SIZE) \ @@ -80,7 +80,7 @@ ROCCAT_COMMON2_SYSFS_R(thingy, COMMAND, SIZE); \ static const struct bin_attribute bin_attr_ ## thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0440 }, \ .size =3D SIZE, \ - .read_new =3D roccat_common2_sysfs_read_ ## thingy, \ + .read =3D roccat_common2_sysfs_read_ ## thingy, \ } =20 #define ROCCAT_COMMON2_BIN_ATTRIBUTE_W(thingy, COMMAND, SIZE) \ @@ -88,7 +88,7 @@ ROCCAT_COMMON2_SYSFS_W(thingy, COMMAND, SIZE); \ static const struct bin_attribute bin_attr_ ## thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0220 }, \ .size =3D SIZE, \ - .write_new =3D roccat_common2_sysfs_write_ ## thingy \ + .write =3D roccat_common2_sysfs_write_ ## thingy \ } =20 #endif diff --git a/drivers/hid/hid-roccat-isku.c b/drivers/hid/hid-roccat-isku.c index 65a84bfcc2f86432753c148dbb78d77de70bafb9..9fddc42f241b21328b58efa43ac= 6d1213b494ab1 100644 --- a/drivers/hid/hid-roccat-isku.c +++ b/drivers/hid/hid-roccat-isku.c @@ -181,8 +181,8 @@ ISKU_SYSFS_RW(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0660 }, \ .size =3D ISKU_SIZE_ ## THINGY, \ - .read_new =3D isku_sysfs_read_ ## thingy, \ - .write_new =3D isku_sysfs_write_ ## thingy \ + .read =3D isku_sysfs_read_ ## thingy, \ + .write =3D isku_sysfs_write_ ## thingy \ } =20 #define ISKU_BIN_ATTR_R(thingy, THINGY) \ @@ -190,7 +190,7 @@ ISKU_SYSFS_R(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0440 }, \ .size =3D ISKU_SIZE_ ## THINGY, \ - .read_new =3D isku_sysfs_read_ ## thingy, \ + .read =3D isku_sysfs_read_ ## thingy, \ } =20 #define ISKU_BIN_ATTR_W(thingy, THINGY) \ @@ -198,7 +198,7 @@ ISKU_SYSFS_W(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0220 }, \ .size =3D ISKU_SIZE_ ## THINGY, \ - .write_new =3D isku_sysfs_write_ ## thingy \ + .write =3D isku_sysfs_write_ ## thingy \ } =20 ISKU_BIN_ATTR_RW(macro, MACRO); diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c index b3c0242e5a37848893e2ab4303f5e6f04a650208..af8ef42aca02809a934c3efe1b3= c7eb8fbc4da54 100644 --- a/drivers/hid/hid-roccat-kone.c +++ b/drivers/hid/hid-roccat-kone.c @@ -385,8 +385,8 @@ static ssize_t kone_sysfs_write_profilex(struct file *f= p, static const struct bin_attribute bin_attr_profile##number =3D { \ .attr =3D { .name =3D "profile" #number, .mode =3D 0660 }, \ .size =3D sizeof(struct kone_profile), \ - .read_new =3D kone_sysfs_read_profilex, \ - .write_new =3D kone_sysfs_write_profilex, \ + .read =3D kone_sysfs_read_profilex, \ + .write =3D kone_sysfs_write_profilex, \ .private =3D &profile_numbers[number-1], \ } PROFILE_ATTR(1); diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-kon= eplus.c index 5d8a5ce88b4cae003cf0e0cbf6dc818ac71e0625..c3f01f7b7e488d2aa21bf82a376= 01035fe3970a9 100644 --- a/drivers/hid/hid-roccat-koneplus.c +++ b/drivers/hid/hid-roccat-koneplus.c @@ -153,8 +153,8 @@ KONEPLUS_SYSFS_RW(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0660 }, \ .size =3D KONEPLUS_SIZE_ ## THINGY, \ - .read_new =3D koneplus_sysfs_read_ ## thingy, \ - .write_new =3D koneplus_sysfs_write_ ## thingy \ + .read =3D koneplus_sysfs_read_ ## thingy, \ + .write =3D koneplus_sysfs_write_ ## thingy \ } =20 #define KONEPLUS_BIN_ATTRIBUTE_R(thingy, THINGY) \ @@ -162,7 +162,7 @@ KONEPLUS_SYSFS_R(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0440 }, \ .size =3D KONEPLUS_SIZE_ ## THINGY, \ - .read_new =3D koneplus_sysfs_read_ ## thingy, \ + .read =3D koneplus_sysfs_read_ ## thingy, \ } =20 #define KONEPLUS_BIN_ATTRIBUTE_W(thingy, THINGY) \ @@ -170,7 +170,7 @@ KONEPLUS_SYSFS_W(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0220 }, \ .size =3D KONEPLUS_SIZE_ ## THINGY, \ - .write_new =3D koneplus_sysfs_write_ ## thingy \ + .write =3D koneplus_sysfs_write_ ## thingy \ } KONEPLUS_BIN_ATTRIBUTE_W(control, CONTROL); KONEPLUS_BIN_ATTRIBUTE_W(talk, TALK); @@ -222,13 +222,13 @@ static ssize_t koneplus_sysfs_read_profilex_buttons(s= truct file *fp, static const struct bin_attribute bin_attr_profile##number##_settings =3D = { \ .attr =3D { .name =3D "profile" #number "_settings", .mode =3D 0440 }, \ .size =3D KONEPLUS_SIZE_PROFILE_SETTINGS, \ - .read_new =3D koneplus_sysfs_read_profilex_settings, \ + .read =3D koneplus_sysfs_read_profilex_settings, \ .private =3D &profile_numbers[number-1], \ }; \ static const struct bin_attribute bin_attr_profile##number##_buttons =3D {= \ .attr =3D { .name =3D "profile" #number "_buttons", .mode =3D 0440 }, \ .size =3D KONEPLUS_SIZE_PROFILE_BUTTONS, \ - .read_new =3D koneplus_sysfs_read_profilex_buttons, \ + .read =3D koneplus_sysfs_read_profilex_buttons, \ .private =3D &profile_numbers[number-1], \ }; PROFILE_ATTR(1); diff --git a/drivers/hid/hid-roccat-kovaplus.c b/drivers/hid/hid-roccat-kov= aplus.c index e31e4a2e62d5a79241a0e2a0fcb9518f4f6c59ff..7d625ed53c9f4b82490bc5b76a8= e8263e4c8cadc 100644 --- a/drivers/hid/hid-roccat-kovaplus.c +++ b/drivers/hid/hid-roccat-kovaplus.c @@ -196,8 +196,8 @@ KOVAPLUS_SYSFS_RW(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0660 }, \ .size =3D KOVAPLUS_SIZE_ ## THINGY, \ - .read_new =3D kovaplus_sysfs_read_ ## thingy, \ - .write_new =3D kovaplus_sysfs_write_ ## thingy \ + .read =3D kovaplus_sysfs_read_ ## thingy, \ + .write =3D kovaplus_sysfs_write_ ## thingy \ } =20 #define KOVAPLUS_BIN_ATTRIBUTE_W(thingy, THINGY) \ @@ -205,7 +205,7 @@ KOVAPLUS_SYSFS_W(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0220 }, \ .size =3D KOVAPLUS_SIZE_ ## THINGY, \ - .write_new =3D kovaplus_sysfs_write_ ## thingy \ + .write =3D kovaplus_sysfs_write_ ## thingy \ } KOVAPLUS_BIN_ATTRIBUTE_W(control, CONTROL); KOVAPLUS_BIN_ATTRIBUTE_RW(info, INFO); @@ -252,13 +252,13 @@ static ssize_t kovaplus_sysfs_read_profilex_buttons(s= truct file *fp, static const struct bin_attribute bin_attr_profile##number##_settings =3D = { \ .attr =3D { .name =3D "profile" #number "_settings", .mode =3D 0440 }, \ .size =3D KOVAPLUS_SIZE_PROFILE_SETTINGS, \ - .read_new =3D kovaplus_sysfs_read_profilex_settings, \ + .read =3D kovaplus_sysfs_read_profilex_settings, \ .private =3D &profile_numbers[number-1], \ }; \ static const struct bin_attribute bin_attr_profile##number##_buttons =3D {= \ .attr =3D { .name =3D "profile" #number "_buttons", .mode =3D 0440 }, \ .size =3D KOVAPLUS_SIZE_PROFILE_BUTTONS, \ - .read_new =3D kovaplus_sysfs_read_profilex_buttons, \ + .read =3D kovaplus_sysfs_read_profilex_buttons, \ .private =3D &profile_numbers[number-1], \ }; PROFILE_ATTR(1); diff --git a/drivers/hid/hid-roccat-lua.c b/drivers/hid/hid-roccat-lua.c index 023ec64b4b0ea2f8168839ef6fd2c93c02846eab..45e30549c236cfc90b2b3d971ae= 836208c6f7a78 100644 --- a/drivers/hid/hid-roccat-lua.c +++ b/drivers/hid/hid-roccat-lua.c @@ -88,8 +88,8 @@ LUA_SYSFS_R(thingy, THINGY) \ static const struct bin_attribute lua_ ## thingy ## _attr =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0660 }, \ .size =3D LUA_SIZE_ ## THINGY, \ - .read_new =3D lua_sysfs_read_ ## thingy, \ - .write_new =3D lua_sysfs_write_ ## thingy \ + .read =3D lua_sysfs_read_ ## thingy, \ + .write =3D lua_sysfs_write_ ## thingy \ }; =20 LUA_BIN_ATTRIBUTE_RW(control, CONTROL) diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c index 2b53fbfbb8979ad1d1994e462b624b3f72480447..dbb9055853696bafad6266872f1= 8819b5560a6c3 100644 --- a/drivers/hid/hid-roccat-pyra.c +++ b/drivers/hid/hid-roccat-pyra.c @@ -154,8 +154,8 @@ PYRA_SYSFS_RW(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0660 }, \ .size =3D PYRA_SIZE_ ## THINGY, \ - .read_new =3D pyra_sysfs_read_ ## thingy, \ - .write_new =3D pyra_sysfs_write_ ## thingy \ + .read =3D pyra_sysfs_read_ ## thingy, \ + .write =3D pyra_sysfs_write_ ## thingy \ } =20 #define PYRA_BIN_ATTRIBUTE_R(thingy, THINGY) \ @@ -163,7 +163,7 @@ PYRA_SYSFS_R(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0440 }, \ .size_new =3D PYRA_SIZE_ ## THINGY, \ - .read_new =3D pyra_sysfs_read_ ## thingy, \ + .read =3D pyra_sysfs_read_ ## thingy, \ } =20 #define PYRA_BIN_ATTRIBUTE_W(thingy, THINGY) \ @@ -171,7 +171,7 @@ PYRA_SYSFS_W(thingy, THINGY); \ static const struct bin_attribute bin_attr_##thingy =3D { \ .attr =3D { .name =3D #thingy, .mode =3D 0220 }, \ .size =3D PYRA_SIZE_ ## THINGY, \ - .write_new =3D pyra_sysfs_write_ ## thingy \ + .write =3D pyra_sysfs_write_ ## thingy \ } =20 PYRA_BIN_ATTRIBUTE_W(control, CONTROL); @@ -219,13 +219,13 @@ static ssize_t pyra_sysfs_read_profilex_buttons(struc= t file *fp, static const struct bin_attribute bin_attr_profile##number##_settings =3D = { \ .attr =3D { .name =3D "profile" #number "_settings", .mode =3D 0440 }, \ .size =3D PYRA_SIZE_PROFILE_SETTINGS, \ - .read_new =3D pyra_sysfs_read_profilex_settings, \ + .read =3D pyra_sysfs_read_profilex_settings, \ .private =3D &profile_numbers[number-1], \ }; \ static const struct bin_attribute bin_attr_profile##number##_buttons =3D {= \ .attr =3D { .name =3D "profile" #number "_buttons", .mode =3D 0440 }, \ .size =3D PYRA_SIZE_PROFILE_BUTTONS, \ - .read_new =3D pyra_sysfs_read_profilex_buttons, \ + .read =3D pyra_sysfs_read_profilex_buttons, \ .private =3D &profile_numbers[number-1], \ }; PROFILE_ATTR(1); diff --git a/drivers/i2c/i2c-slave-eeprom.c b/drivers/i2c/i2c-slave-eeprom.c index 275d1d0e910fbec72c4795cb3aafa714c52fcd94..6bc2ef650a74eb61f36ff7e3ada= c5f7709213085 100644 --- a/drivers/i2c/i2c-slave-eeprom.c +++ b/drivers/i2c/i2c-slave-eeprom.c @@ -165,8 +165,8 @@ static int i2c_slave_eeprom_probe(struct i2c_client *cl= ient) sysfs_bin_attr_init(&eeprom->bin); eeprom->bin.attr.name =3D "slave-eeprom"; eeprom->bin.attr.mode =3D S_IRUSR | S_IWUSR; - eeprom->bin.read_new =3D i2c_slave_eeprom_bin_read; - eeprom->bin.write_new =3D i2c_slave_eeprom_bin_write; + eeprom->bin.read =3D i2c_slave_eeprom_bin_read; + eeprom->bin.write =3D i2c_slave_eeprom_bin_write; eeprom->bin.size =3D size; =20 ret =3D sysfs_create_bin_file(&client->dev.kobj, &eeprom->bin); diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci= /solo6x10/solo6x10-core.c index febb2c156cf63af185c04937926f963eb71e690b..d1d3a83d01226fb08345f4d85ef= 0c2ea938c3af2 100644 --- a/drivers/media/pci/solo6x10/solo6x10-core.c +++ b/drivers/media/pci/solo6x10/solo6x10-core.c @@ -432,7 +432,7 @@ static int solo_sysfs_init(struct solo_dev *solo_dev) sysfs_attr_init(&sdram_attr->attr); sdram_attr->attr.name =3D "sdram"; sdram_attr->attr.mode =3D 0440; - sdram_attr->read_new =3D sdram_show; + sdram_attr->read =3D sdram_show; sdram_attr->size =3D solo_dev->sdram_size; =20 if (device_create_bin_file(dev, sdram_attr)) { diff --git a/drivers/misc/ds1682.c b/drivers/misc/ds1682.c index 5d5a70a62e98b6691aac1c0f9142d39555ba4f8c..cb09e056531a47fac215185b072= 6d76af2efe5cd 100644 --- a/drivers/misc/ds1682.c +++ b/drivers/misc/ds1682.c @@ -194,8 +194,8 @@ static const struct bin_attribute ds1682_eeprom_attr = =3D { .mode =3D S_IRUGO | S_IWUSR, }, .size =3D DS1682_EEPROM_SIZE, - .read_new =3D ds1682_eeprom_read, - .write_new =3D ds1682_eeprom_write, + .read =3D ds1682_eeprom_read, + .write =3D ds1682_eeprom_write, }; =20 static int ds1682_nvmem_read(void *priv, unsigned int offset, void *val, diff --git a/drivers/misc/eeprom/max6875.c b/drivers/misc/eeprom/max6875.c index 1c36ad153e783ead6ba2481c64838390f0bb05f4..a3e4cada3b51011a24775e1000a= 8f8002f0b226e 100644 --- a/drivers/misc/eeprom/max6875.c +++ b/drivers/misc/eeprom/max6875.c @@ -127,7 +127,7 @@ static const struct bin_attribute user_eeprom_attr =3D { .mode =3D S_IRUGO, }, .size =3D USER_EEPROM_SIZE, - .read_new =3D max6875_read, + .read =3D max6875_read, }; =20 static int max6875_probe(struct i2c_client *client) diff --git a/drivers/misc/ocxl/sysfs.c b/drivers/misc/ocxl/sysfs.c index e849641687a005fec5eb7a6b2e96bc0e9d04dc05..3100f0944fd996024f6eaf45da8= 8a51a7dbb2ac5 100644 --- a/drivers/misc/ocxl/sysfs.c +++ b/drivers/misc/ocxl/sysfs.c @@ -155,7 +155,7 @@ int ocxl_sysfs_register_afu(struct ocxl_file_info *info) info->attr_global_mmio.attr.name =3D "global_mmio_area"; info->attr_global_mmio.attr.mode =3D 0600; info->attr_global_mmio.size =3D info->afu->config.global_mmio_size; - info->attr_global_mmio.read_new =3D global_mmio_read; + info->attr_global_mmio.read =3D global_mmio_read; info->attr_global_mmio.mmap =3D global_mmio_mmap; rc =3D device_create_bin_file(&info->dev, &info->attr_global_mmio); if (rc) { diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c index 6121c0940cd148d48b8d574065c50703b6a301d7..7bee179841bcde4e8f41dddd717= 40f6a97b5c823 100644 --- a/drivers/misc/pch_phub.c +++ b/drivers/misc/pch_phub.c @@ -655,8 +655,8 @@ static const struct bin_attribute pch_bin_attr =3D { .mode =3D S_IRUGO | S_IWUSR, }, .size =3D PCH_PHUB_OROM_SIZE + 1, - .read_new =3D pch_phub_bin_read, - .write_new =3D pch_phub_bin_write, + .read =3D pch_phub_bin_read, + .write =3D pch_phub_bin_write, }; =20 static int pch_phub_probe(struct pci_dev *pdev, diff --git a/drivers/misc/sram.c b/drivers/misc/sram.c index e5069882457ef6ba5dc084d02994034dc39d24c6..8fb8a43de29615ee3ec1a8d2220= 95e10b4b28990 100644 --- a/drivers/misc/sram.c +++ b/drivers/misc/sram.c @@ -83,8 +83,8 @@ static int sram_add_export(struct sram_dev *sram, struct = sram_reserve *block, return -ENOMEM; =20 part->battr.attr.mode =3D S_IRUSR | S_IWUSR; - part->battr.read_new =3D sram_read; - part->battr.write_new =3D sram_write; + part->battr.read =3D sram_read; + part->battr.write =3D sram_write; part->battr.size =3D block->size; =20 return device_create_bin_file(sram->dev, &part->battr); diff --git a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c b/drivers= /net/ethernet/qlogic/netxen/netxen_nic_main.c index 3383ee1dad14e2cb40062b27f32a7cffb6f3fac2..e8ff661fa4a5207470de6f8bff1= 7d7b77ba73afc 100644 --- a/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c +++ b/drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c @@ -2946,15 +2946,15 @@ static ssize_t netxen_sysfs_write_mem(struct file *= filp, struct kobject *kobj, static const struct bin_attribute bin_attr_crb =3D { .attr =3D { .name =3D "crb", .mode =3D 0644 }, .size =3D 0, - .read_new =3D netxen_sysfs_read_crb, - .write_new =3D netxen_sysfs_write_crb, + .read =3D netxen_sysfs_read_crb, + .write =3D netxen_sysfs_write_crb, }; =20 static const struct bin_attribute bin_attr_mem =3D { .attr =3D { .name =3D "mem", .mode =3D 0644 }, .size =3D 0, - .read_new =3D netxen_sysfs_read_mem, - .write_new =3D netxen_sysfs_write_mem, + .read =3D netxen_sysfs_read_mem, + .write =3D netxen_sysfs_write_mem, }; =20 static ssize_t @@ -3082,7 +3082,7 @@ netxen_sysfs_read_dimm(struct file *filp, struct kobj= ect *kobj, static const struct bin_attribute bin_attr_dimm =3D { .attr =3D { .name =3D "dimm", .mode =3D 0644 }, .size =3D sizeof(struct netxen_dimm_cfg), - .read_new =3D netxen_sysfs_read_dimm, + .read =3D netxen_sysfs_read_dimm, }; =20 =20 diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c b/drivers/ne= t/ethernet/qlogic/qlcnic/qlcnic_sysfs.c index c0f20464fd1e0123b06c128a67f4091a5ba973eb..5296d9a6ee831f5c23eceae080b= 440d861a614c5 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c @@ -1195,63 +1195,63 @@ static const struct device_attribute dev_attr_beaco= n =3D { static const struct bin_attribute bin_attr_crb =3D { .attr =3D { .name =3D "crb", .mode =3D 0644 }, .size =3D 0, - .read_new =3D qlcnic_sysfs_read_crb, - .write_new =3D qlcnic_sysfs_write_crb, + .read =3D qlcnic_sysfs_read_crb, + .write =3D qlcnic_sysfs_write_crb, }; =20 static const struct bin_attribute bin_attr_mem =3D { .attr =3D { .name =3D "mem", .mode =3D 0644 }, .size =3D 0, - .read_new =3D qlcnic_sysfs_read_mem, - .write_new =3D qlcnic_sysfs_write_mem, + .read =3D qlcnic_sysfs_read_mem, + .write =3D qlcnic_sysfs_write_mem, }; =20 static const struct bin_attribute bin_attr_npar_config =3D { .attr =3D { .name =3D "npar_config", .mode =3D 0644 }, .size =3D 0, - .read_new =3D qlcnic_sysfs_read_npar_config, - .write_new =3D qlcnic_sysfs_write_npar_config, + .read =3D qlcnic_sysfs_read_npar_config, + .write =3D qlcnic_sysfs_write_npar_config, }; =20 static const struct bin_attribute bin_attr_pci_config =3D { .attr =3D { .name =3D "pci_config", .mode =3D 0644 }, .size =3D 0, - .read_new =3D qlcnic_sysfs_read_pci_config, + .read =3D qlcnic_sysfs_read_pci_config, }; =20 static const struct bin_attribute bin_attr_port_stats =3D { .attr =3D { .name =3D "port_stats", .mode =3D 0644 }, .size =3D 0, - .read_new =3D qlcnic_sysfs_get_port_stats, - .write_new =3D qlcnic_sysfs_clear_port_stats, + .read =3D qlcnic_sysfs_get_port_stats, + .write =3D qlcnic_sysfs_clear_port_stats, }; =20 static const struct bin_attribute bin_attr_esw_stats =3D { .attr =3D { .name =3D "esw_stats", .mode =3D 0644 }, .size =3D 0, - .read_new =3D qlcnic_sysfs_get_esw_stats, - .write_new =3D qlcnic_sysfs_clear_esw_stats, + .read =3D qlcnic_sysfs_get_esw_stats, + .write =3D qlcnic_sysfs_clear_esw_stats, }; =20 static const struct bin_attribute bin_attr_esw_config =3D { .attr =3D { .name =3D "esw_config", .mode =3D 0644 }, .size =3D 0, - .read_new =3D qlcnic_sysfs_read_esw_config, - .write_new =3D qlcnic_sysfs_write_esw_config, + .read =3D qlcnic_sysfs_read_esw_config, + .write =3D qlcnic_sysfs_write_esw_config, }; =20 static const struct bin_attribute bin_attr_pm_config =3D { .attr =3D { .name =3D "pm_config", .mode =3D 0644 }, .size =3D 0, - .read_new =3D qlcnic_sysfs_read_pm_config, - .write_new =3D qlcnic_sysfs_write_pm_config, + .read =3D qlcnic_sysfs_read_pm_config, + .write =3D qlcnic_sysfs_write_pm_config, }; =20 static const struct bin_attribute bin_attr_flash =3D { .attr =3D { .name =3D "flash", .mode =3D 0644 }, .size =3D 0, - .read_new =3D qlcnic_83xx_sysfs_flash_read_handler, - .write_new =3D qlcnic_83xx_sysfs_flash_write_handler, + .read =3D qlcnic_83xx_sysfs_flash_read_handler, + .write =3D qlcnic_83xx_sysfs_flash_write_handler, }; =20 #ifdef CONFIG_QLCNIC_HWMON diff --git a/drivers/net/phy/spi_ks8995.c b/drivers/net/phy/spi_ks8995.c index 076a370be849e00c57a3be0bbce83c4665c49593..d135b061d810b7ba0c0731d43d1= 76f3ba46b3f52 100644 --- a/drivers/net/phy/spi_ks8995.c +++ b/drivers/net/phy/spi_ks8995.c @@ -401,8 +401,8 @@ static const struct bin_attribute ks8995_registers_attr= =3D { .mode =3D 0600, }, .size =3D KS8995_REGS_SIZE, - .read_new =3D ks8995_registers_read, - .write_new =3D ks8995_registers_write, + .read =3D ks8995_registers_read, + .write =3D ks8995_registers_write, }; =20 /* -----------------------------------------------------------------------= - */ diff --git a/drivers/net/wireless/ti/wlcore/sysfs.c b/drivers/net/wireless/= ti/wlcore/sysfs.c index 7c57d4c8744ad5d19f11c5765cc7bf27aadbf740..65ca5dc569a0471a8042c069eb9= da81614e708b0 100644 --- a/drivers/net/wireless/ti/wlcore/sysfs.c +++ b/drivers/net/wireless/ti/wlcore/sysfs.c @@ -121,7 +121,7 @@ static ssize_t wl1271_sysfs_read_fwlog(struct file *fil= p, struct kobject *kobj, =20 static const struct bin_attribute fwlog_attr =3D { .attr =3D { .name =3D "fwlog", .mode =3D 0400 }, - .read_new =3D wl1271_sysfs_read_fwlog, + .read =3D wl1271_sysfs_read_fwlog, }; =20 int wlcore_sysfs_init(struct wl1271 *wl) diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index fd2a9698d1c93ee52a4d86f6e0a19d2dfb6efb54..f0a664bcb01a0b43fb6ea9cd62c= b01211277b931 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -376,8 +376,8 @@ static const struct bin_attribute bin_attr_rw_nvmem =3D= { .name =3D "nvmem", .mode =3D 0644, }, - .read_new =3D bin_attr_nvmem_read, - .write_new =3D bin_attr_nvmem_write, + .read =3D bin_attr_nvmem_read, + .write =3D bin_attr_nvmem_write, }; =20 static const struct bin_attribute *const nvmem_bin_attributes[] =3D { @@ -402,8 +402,8 @@ static const struct bin_attribute bin_attr_nvmem_eeprom= _compat =3D { .attr =3D { .name =3D "eeprom", }, - .read_new =3D bin_attr_nvmem_read, - .write_new =3D bin_attr_nvmem_write, + .read =3D bin_attr_nvmem_read, + .write =3D bin_attr_nvmem_write, }; =20 /* @@ -492,7 +492,7 @@ static int nvmem_populate_sysfs_cells(struct nvmem_devi= ce *nvmem) entry->bit_offset); attrs[i].attr.mode =3D 0444 & nvmem_bin_attr_get_umode(nvmem); attrs[i].size =3D entry->bytes; - attrs[i].read_new =3D &nvmem_cell_attr_read; + attrs[i].read =3D &nvmem_cell_attr_read; attrs[i].private =3D entry; if (!attrs[i].attr.name) { ret =3D -ENOMEM; diff --git a/drivers/of/kobj.c b/drivers/of/kobj.c index aa887166f0d21030d620d43c864ca76cde1c6d05..1bb61a2c33994df9d57f33e4bb4= 1ba8483a174c2 100644 --- a/drivers/of/kobj.c +++ b/drivers/of/kobj.c @@ -77,7 +77,7 @@ int __of_add_property_sysfs(struct device_node *np, struc= t property *pp) pp->attr.attr.name =3D safe_name(&np->kobj, pp->name); pp->attr.attr.mode =3D secure ? 0400 : 0444; pp->attr.size =3D secure ? 0 : pp->length; - pp->attr.read_new =3D of_node_property_read; + pp->attr.read =3D of_node_property_read; =20 rc =3D sysfs_create_bin_file(&np->kobj, &pp->attr); WARN(rc, "error adding attribute %s to node %pOF\n", pp->name, np); diff --git a/drivers/pci/hotplug/acpiphp_ibm.c b/drivers/pci/hotplug/acpiph= p_ibm.c index b3aa34e3a4a29417bd694273779dc356be284f1d..18e01cd55a8ecf5eb926a4c8758= 71e9518c64d0b 100644 --- a/drivers/pci/hotplug/acpiphp_ibm.c +++ b/drivers/pci/hotplug/acpiphp_ibm.c @@ -98,7 +98,7 @@ static struct bin_attribute ibm_apci_table_attr __ro_afte= r_init =3D { .name =3D "apci_table", .mode =3D S_IRUGO, }, - .read_new =3D ibm_read_apci_table, + .read =3D ibm_read_apci_table, .write =3D NULL, }; static struct acpiphp_attention_info ibm_attention_info =3D diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 268c69daa4d573ddd584c837b2d382dc8a3922e0..f2739eafef9bf1578a08beb6738= 7865537ab6a3e 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -1004,8 +1004,8 @@ void pci_create_legacy_files(struct pci_bus *b) b->legacy_io->attr.name =3D "legacy_io"; b->legacy_io->size =3D 0xffff; b->legacy_io->attr.mode =3D 0600; - b->legacy_io->read_new =3D pci_read_legacy_io; - b->legacy_io->write_new =3D pci_write_legacy_io; + b->legacy_io->read =3D pci_read_legacy_io; + b->legacy_io->write =3D pci_write_legacy_io; /* See pci_create_attr() for motivation */ b->legacy_io->llseek =3D pci_llseek_resource; b->legacy_io->mmap =3D pci_mmap_legacy_io; @@ -1211,8 +1211,8 @@ static int pci_create_attr(struct pci_dev *pdev, int = num, int write_combine) } else { sprintf(res_attr_name, "resource%d", num); if (pci_resource_flags(pdev, num) & IORESOURCE_IO) { - res_attr->read_new =3D pci_read_resource_io; - res_attr->write_new =3D pci_write_resource_io; + res_attr->read =3D pci_read_resource_io; + res_attr->write =3D pci_write_resource_io; if (arch_can_pci_mmap_io()) res_attr->mmap =3D pci_mmap_resource_uc; } else { diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c index 0c801e4ccc6c2c8701ecf855e10a67a677c85278..05b67fd93de60d9a9ed0c21b519= 85a99b2924f79 100644 --- a/drivers/pcmcia/cistpl.c +++ b/drivers/pcmcia/cistpl.c @@ -1605,6 +1605,6 @@ static ssize_t pccard_store_cis(struct file *filp, st= ruct kobject *kobj, const struct bin_attribute pccard_cis_attr =3D { .attr =3D { .name =3D "cis", .mode =3D S_IRUGO | S_IWUSR }, .size =3D 0x200, - .read_new =3D pccard_show_cis, - .write_new =3D pccard_store_cis, + .read =3D pccard_show_cis, + .write =3D pccard_store_cis, }; diff --git a/drivers/platform/mellanox/mlxbf-bootctl.c b/drivers/platform/m= ellanox/mlxbf-bootctl.c index c18a5b96de5ce78cd87d35878e82d293f0c201cc..f67c7f56ab2b703574faef2ae28= b2fec79941b9e 100644 --- a/drivers/platform/mellanox/mlxbf-bootctl.c +++ b/drivers/platform/mellanox/mlxbf-bootctl.c @@ -993,7 +993,7 @@ static ssize_t mlxbf_bootctl_bootfifo_read(struct file = *filp, =20 static const struct bin_attribute mlxbf_bootctl_bootfifo_sysfs_attr =3D { .attr =3D { .name =3D "bootfifo", .mode =3D 0400 }, - .read_new =3D mlxbf_bootctl_bootfifo_read, + .read =3D mlxbf_bootctl_bootfifo_read, }; =20 static bool mlxbf_bootctl_guid_match(const guid_t *guid, diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/am= d/hsmp/acpi.c index 2f1faa82d13e824a5349b569a77520d1e29c4b68..63af9dae02542cc4736c01559e1= 8cebbf42a7e71 100644 --- a/drivers/platform/x86/amd/hsmp/acpi.c +++ b/drivers/platform/x86/amd/hsmp/acpi.c @@ -509,7 +509,7 @@ static int init_acpi(struct device *dev) =20 static const struct bin_attribute hsmp_metric_tbl_attr =3D { .attr =3D { .name =3D HSMP_METRICS_TABLE_NAME, .mode =3D 0444}, - .read_new =3D hsmp_metric_tbl_acpi_read, + .read =3D hsmp_metric_tbl_acpi_read, .size =3D sizeof(struct hsmp_metric_table), }; =20 diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/am= d/hsmp/plat.c index e3874c47ed9ed6d5a2c45cbb45d4d567404437db..b6dceca28bdb99dd5f83a7354cd= 22d8c7faaa684 100644 --- a/drivers/platform/x86/amd/hsmp/plat.c +++ b/drivers/platform/x86/amd/hsmp/plat.c @@ -91,7 +91,7 @@ static_assert(MAX_AMD_NUM_NODES =3D=3D 8); static const struct bin_attribute attr##index =3D { \ .attr =3D { .name =3D HSMP_METRICS_TABLE_NAME, .mode =3D 0444}, \ .private =3D (void *)index, \ - .read_new =3D hsmp_metric_tbl_plat_read, \ + .read =3D hsmp_metric_tbl_plat_read, \ .size =3D sizeof(struct hsmp_metric_table), \ }; \ static const struct bin_attribute _list[] =3D { \ diff --git a/drivers/platform/x86/intel/pmt/class.c b/drivers/platform/x86/= intel/pmt/class.c index 7233b654bbad1537ed0b0b08c56741d46cfe1eaf..3ed20da80a87e5867cb9a0a5614= d04f390109d06 100644 --- a/drivers/platform/x86/intel/pmt/class.c +++ b/drivers/platform/x86/intel/pmt/class.c @@ -308,7 +308,7 @@ static int intel_pmt_dev_register(struct intel_pmt_entr= y *entry, entry->pmt_bin_attr.attr.name =3D ns->name; entry->pmt_bin_attr.attr.mode =3D 0440; entry->pmt_bin_attr.mmap =3D intel_pmt_mmap; - entry->pmt_bin_attr.read_new =3D intel_pmt_read; + entry->pmt_bin_attr.read =3D intel_pmt_read; entry->pmt_bin_attr.size =3D entry->size; =20 ret =3D sysfs_create_bin_file(&dev->kobj, &entry->pmt_bin_attr); diff --git a/drivers/power/supply/ds2780_battery.c b/drivers/power/supply/d= s2780_battery.c index dd9ac7a3296716d8ab72db56c1d9c0e439c3b2a9..8352c6401cbfab1ea03a3f946d1= 3e05cbb190b37 100644 --- a/drivers/power/supply/ds2780_battery.c +++ b/drivers/power/supply/ds2780_battery.c @@ -660,8 +660,8 @@ static const struct bin_attribute ds2780_param_eeprom_b= in_attr =3D { .mode =3D S_IRUGO | S_IWUSR, }, .size =3D DS2780_PARAM_EEPROM_SIZE, - .read_new =3D ds2780_read_param_eeprom_bin, - .write_new =3D ds2780_write_param_eeprom_bin, + .read =3D ds2780_read_param_eeprom_bin, + .write =3D ds2780_write_param_eeprom_bin, }; =20 static ssize_t ds2780_read_user_eeprom_bin(struct file *filp, @@ -705,8 +705,8 @@ static const struct bin_attribute ds2780_user_eeprom_bi= n_attr =3D { .mode =3D S_IRUGO | S_IWUSR, }, .size =3D DS2780_USER_EEPROM_SIZE, - .read_new =3D ds2780_read_user_eeprom_bin, - .write_new =3D ds2780_write_user_eeprom_bin, + .read =3D ds2780_read_user_eeprom_bin, + .write =3D ds2780_write_user_eeprom_bin, }; =20 static DEVICE_ATTR(pmod_enabled, S_IRUGO | S_IWUSR, ds2780_get_pmod_enable= d, diff --git a/drivers/power/supply/ds2781_battery.c b/drivers/power/supply/d= s2781_battery.c index 8a1f1f9835e09598dd9f9426e0b63a0c5a3b4cc1..43a6b022901e39fd1aedfc744dc= 84b64451de2cb 100644 --- a/drivers/power/supply/ds2781_battery.c +++ b/drivers/power/supply/ds2781_battery.c @@ -662,8 +662,8 @@ static const struct bin_attribute ds2781_param_eeprom_b= in_attr =3D { .mode =3D S_IRUGO | S_IWUSR, }, .size =3D DS2781_PARAM_EEPROM_SIZE, - .read_new =3D ds2781_read_param_eeprom_bin, - .write_new =3D ds2781_write_param_eeprom_bin, + .read =3D ds2781_read_param_eeprom_bin, + .write =3D ds2781_write_param_eeprom_bin, }; =20 static ssize_t ds2781_read_user_eeprom_bin(struct file *filp, @@ -708,8 +708,8 @@ static const struct bin_attribute ds2781_user_eeprom_bi= n_attr =3D { .mode =3D S_IRUGO | S_IWUSR, }, .size =3D DS2781_USER_EEPROM_SIZE, - .read_new =3D ds2781_read_user_eeprom_bin, - .write_new =3D ds2781_write_user_eeprom_bin, + .read =3D ds2781_read_user_eeprom_bin, + .write =3D ds2781_write_user_eeprom_bin, }; =20 static DEVICE_ATTR(pmod_enabled, S_IRUGO | S_IWUSR, ds2781_get_pmod_enable= d, diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olp= c_battery.c index b9b6078226763459ad805db266d6e52d6de057ee..a9760dbb16163ffebab218d9516= 62ab5e3331d11 100644 --- a/drivers/power/supply/olpc_battery.c +++ b/drivers/power/supply/olpc_battery.c @@ -553,7 +553,7 @@ static const struct bin_attribute olpc_bat_eeprom =3D { .mode =3D S_IRUGO, }, .size =3D EEPROM_SIZE, - .read_new =3D olpc_bat_eeprom_read, + .read =3D olpc_bat_eeprom_read, }; =20 /* Allow userspace to see the specific error value pulled from the EC */ diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c index 6f89b232f1d5d10a4dccf51422a57d4355ccf0c2..5e8c22677e460c4a774f36e90c5= 0930b2a0e8987 100644 --- a/drivers/rapidio/rio-sysfs.c +++ b/drivers/rapidio/rio-sysfs.c @@ -247,8 +247,8 @@ static const struct bin_attribute rio_config_attr =3D { .mode =3D S_IRUGO | S_IWUSR, }, .size =3D RIO_MAINT_SPACE_SZ, - .read_new =3D rio_read_config, - .write_new =3D rio_write_config, + .read =3D rio_read_config, + .write =3D rio_write_config, }; =20 static const struct bin_attribute *const rio_dev_bin_attrs[] =3D { diff --git a/drivers/s390/char/sclp_config.c b/drivers/s390/char/sclp_confi= g.c index ae5d289871779cc5cc1f3070c64746ea702eb41d..356d26a09af03d1f44cd3ec682c= 32351739f3fc9 100644 --- a/drivers/s390/char/sclp_config.c +++ b/drivers/s390/char/sclp_config.c @@ -142,7 +142,7 @@ static const struct bin_attribute ofb_bin_attr =3D { .name =3D "event_data", .mode =3D S_IWUSR, }, - .write_new =3D sysfs_ofb_data_write, + .write =3D sysfs_ofb_data_write, }; #endif =20 diff --git a/drivers/s390/char/sclp_sd.c b/drivers/s390/char/sclp_sd.c index 8524c14affed68587cace9c2e8ac1f02f87052de..ddd26c4da26aa1b76357bb1e1d8= 415bd84a33565 100644 --- a/drivers/s390/char/sclp_sd.c +++ b/drivers/s390/char/sclp_sd.c @@ -539,7 +539,7 @@ static __init struct sclp_sd_file *sclp_sd_file_create(= const char *name, u8 di) sysfs_bin_attr_init(&sd_file->data_attr); sd_file->data_attr.attr.name =3D "data"; sd_file->data_attr.attr.mode =3D 0444; - sd_file->data_attr.read_new =3D data_read; + sd_file->data_attr.read =3D data_read; =20 rc =3D sysfs_create_bin_file(&sd_file->kobj, &sd_file->data_attr); if (rc) { diff --git a/drivers/scsi/3w-sas.c b/drivers/scsi/3w-sas.c index e057ab9c7b90e8234f4c4993ef672b1a11d47bf8..8d4174c7107ef1fc03a1a71d40f= db20ce15db1b9 100644 --- a/drivers/scsi/3w-sas.c +++ b/drivers/scsi/3w-sas.c @@ -122,7 +122,7 @@ static const struct bin_attribute twl_sysfs_aen_read_at= tr =3D { .mode =3D S_IRUSR, }, .size =3D 0, - .read_new =3D twl_sysfs_aen_read + .read =3D twl_sysfs_aen_read }; =20 /* This function returns driver compatibility info through sysfs */ @@ -153,7 +153,7 @@ static const struct bin_attribute twl_sysfs_compat_info= _attr =3D { .mode =3D S_IRUSR, }, .size =3D 0, - .read_new =3D twl_sysfs_compat_info + .read =3D twl_sysfs_compat_info }; =20 /* Show some statistics about the card */ diff --git a/drivers/scsi/arcmsr/arcmsr_attr.c b/drivers/scsi/arcmsr/arcmsr= _attr.c index 8e3d4799ce93c35b0befe8744fd20aa3fe467ad3..1990af2bef953f027e40763d237= e6c11aee1f46e 100644 --- a/drivers/scsi/arcmsr/arcmsr_attr.c +++ b/drivers/scsi/arcmsr/arcmsr_attr.c @@ -194,7 +194,7 @@ static const struct bin_attribute arcmsr_sysfs_message_= read_attr =3D { .mode =3D S_IRUSR , }, .size =3D ARCMSR_API_DATA_BUFLEN, - .read_new =3D arcmsr_sysfs_iop_message_read, + .read =3D arcmsr_sysfs_iop_message_read, }; =20 static const struct bin_attribute arcmsr_sysfs_message_write_attr =3D { @@ -203,7 +203,7 @@ static const struct bin_attribute arcmsr_sysfs_message_= write_attr =3D { .mode =3D S_IWUSR, }, .size =3D ARCMSR_API_DATA_BUFLEN, - .write_new =3D arcmsr_sysfs_iop_message_write, + .write =3D arcmsr_sysfs_iop_message_write, }; =20 static const struct bin_attribute arcmsr_sysfs_message_clear_attr =3D { @@ -212,7 +212,7 @@ static const struct bin_attribute arcmsr_sysfs_message_= clear_attr =3D { .mode =3D S_IWUSR, }, .size =3D 1, - .write_new =3D arcmsr_sysfs_iop_message_clear, + .write =3D arcmsr_sysfs_iop_message_clear, }; =20 int arcmsr_alloc_sysfs_attr(struct AdapterControlBlock *acb) diff --git a/drivers/scsi/esas2r/esas2r_main.c b/drivers/scsi/esas2r/esas2r= _main.c index 44871746944ad0c0f30f28975ed40e0fde4e8d03..3cc7d4016a39cfe9f0eceeaea0b= 014b03758f78b 100644 --- a/drivers/scsi/esas2r/esas2r_main.c +++ b/drivers/scsi/esas2r/esas2r_main.c @@ -215,8 +215,8 @@ static ssize_t write_hw(struct file *file, struct kobje= ct *kobj, .attr =3D \ { .name =3D __stringify(_name), .mode =3D S_IRUSR | S_IWUSR }, \ .size =3D 0, \ - .read_new =3D read_ ## _name, \ - .write_new =3D write_ ## _name } + .read =3D read_ ## _name, \ + .write =3D write_ ## _name } =20 ESAS2R_RW_BIN_ATTR(fw); ESAS2R_RW_BIN_ATTR(fs); @@ -227,7 +227,7 @@ ESAS2R_RW_BIN_ATTR(live_nvram); const struct bin_attribute bin_attr_default_nvram =3D { .attr =3D { .name =3D "default_nvram", .mode =3D S_IRUGO }, .size =3D 0, - .read_new =3D read_default_nvram, + .read =3D read_default_nvram, .write =3D NULL }; =20 diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c index 4c493b06062ac058ad85781a10f829d298de097f..29c46bc852a5a423b986ea737de= 105e790d86e0f 100644 --- a/drivers/scsi/ibmvscsi/ibmvfc.c +++ b/drivers/scsi/ibmvscsi/ibmvfc.c @@ -3670,7 +3670,7 @@ static const struct bin_attribute ibmvfc_trace_attr = =3D { .mode =3D S_IRUGO, }, .size =3D 0, - .read_new =3D ibmvfc_read_trace, + .read =3D ibmvfc_read_trace, }; #endif =20 diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index d89135fb8faa6be0423d297cfbd02e7c50e18341..faeba9ba314c06ccb58f186f3bc= 03d7c0eb81264 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -3389,7 +3389,7 @@ static const struct bin_attribute ipr_trace_attr =3D { .mode =3D S_IRUGO, }, .size =3D 0, - .read_new =3D ipr_read_trace, + .read =3D ipr_read_trace, }; #endif =20 @@ -4140,8 +4140,8 @@ static const struct bin_attribute ipr_ioa_async_err_l= og =3D { .mode =3D S_IRUGO | S_IWUSR, }, .size =3D 0, - .read_new =3D ipr_read_async_err_log, - .write_new =3D ipr_next_async_err_log + .read =3D ipr_read_async_err_log, + .write =3D ipr_next_async_err_log }; =20 static struct attribute *ipr_ioa_attrs[] =3D { @@ -4391,8 +4391,8 @@ static const struct bin_attribute ipr_dump_attr =3D { .mode =3D S_IRUSR | S_IWUSR, }, .size =3D 0, - .read_new =3D ipr_read_dump, - .write_new =3D ipr_write_dump + .read =3D ipr_read_dump, + .write =3D ipr_write_dump }; #else static int ipr_free_dump(struct ipr_ioa_cfg *ioa_cfg) { return 0; }; diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c index 54ee8ecec3b361bafd22c015129e683abdef29a9..33582d48ec09b53ff08374f228e= b16cf0ce307a5 100644 --- a/drivers/scsi/lpfc/lpfc_attr.c +++ b/drivers/scsi/lpfc/lpfc_attr.c @@ -6420,8 +6420,8 @@ static const struct bin_attribute sysfs_ctlreg_attr = =3D { .mode =3D S_IRUSR | S_IWUSR, }, .size =3D 256, - .read_new =3D sysfs_ctlreg_read, - .write_new =3D sysfs_ctlreg_write, + .read =3D sysfs_ctlreg_read, + .write =3D sysfs_ctlreg_write, }; =20 /** @@ -6478,8 +6478,8 @@ static const struct bin_attribute sysfs_mbox_attr =3D= { .mode =3D S_IRUSR | S_IWUSR, }, .size =3D MAILBOX_SYSFS_MAX, - .read_new =3D sysfs_mbox_read, - .write_new =3D sysfs_mbox_write, + .read =3D sysfs_mbox_read, + .write =3D sysfs_mbox_write, }; =20 /** diff --git a/drivers/scsi/qedf/qedf_attr.c b/drivers/scsi/qedf/qedf_attr.c index 769da92ee20d0fac71525a8265cb6332146585ec..7ebb46689f97a133fdf65dda390= 1355531088f4b 100644 --- a/drivers/scsi/qedf/qedf_attr.c +++ b/drivers/scsi/qedf/qedf_attr.c @@ -166,8 +166,8 @@ static const struct bin_attribute sysfs_grcdump_attr = =3D { .mode =3D S_IRUSR | S_IWUSR, }, .size =3D 0, - .read_new =3D qedf_sysfs_read_grcdump, - .write_new =3D qedf_sysfs_write_grcdump, + .read =3D qedf_sysfs_read_grcdump, + .write =3D qedf_sysfs_write_grcdump, }; =20 static struct sysfs_bin_attrs bin_file_entries[] =3D { diff --git a/drivers/scsi/qla2xxx/qla_attr.c b/drivers/scsi/qla2xxx/qla_att= r.c index dcb0c2af1fa7cf9b63a5613c01b792143142a412..2e584a8bf66b252ac6bd056a776= de22127d1c2a8 100644 --- a/drivers/scsi/qla2xxx/qla_attr.c +++ b/drivers/scsi/qla2xxx/qla_attr.c @@ -174,8 +174,8 @@ static const struct bin_attribute sysfs_fw_dump_attr = =3D { .mode =3D S_IRUSR | S_IWUSR, }, .size =3D 0, - .read_new =3D qla2x00_sysfs_read_fw_dump, - .write_new =3D qla2x00_sysfs_write_fw_dump, + .read =3D qla2x00_sysfs_read_fw_dump, + .write =3D qla2x00_sysfs_write_fw_dump, }; =20 static ssize_t @@ -288,8 +288,8 @@ static const struct bin_attribute sysfs_nvram_attr =3D { .mode =3D S_IRUSR | S_IWUSR, }, .size =3D 512, - .read_new =3D qla2x00_sysfs_read_nvram, - .write_new =3D qla2x00_sysfs_write_nvram, + .read =3D qla2x00_sysfs_read_nvram, + .write =3D qla2x00_sysfs_write_nvram, }; =20 static ssize_t @@ -350,8 +350,8 @@ static const struct bin_attribute sysfs_optrom_attr =3D= { .mode =3D S_IRUSR | S_IWUSR, }, .size =3D 0, - .read_new =3D qla2x00_sysfs_read_optrom, - .write_new =3D qla2x00_sysfs_write_optrom, + .read =3D qla2x00_sysfs_read_optrom, + .write =3D qla2x00_sysfs_write_optrom, }; =20 static ssize_t @@ -535,7 +535,7 @@ static const struct bin_attribute sysfs_optrom_ctl_attr= =3D { .mode =3D S_IWUSR, }, .size =3D 0, - .write_new =3D qla2x00_sysfs_write_optrom_ctl, + .write =3D qla2x00_sysfs_write_optrom_ctl, }; =20 static ssize_t @@ -648,8 +648,8 @@ static const struct bin_attribute sysfs_vpd_attr =3D { .mode =3D S_IRUSR | S_IWUSR, }, .size =3D 0, - .read_new =3D qla2x00_sysfs_read_vpd, - .write_new =3D qla2x00_sysfs_write_vpd, + .read =3D qla2x00_sysfs_read_vpd, + .write =3D qla2x00_sysfs_write_vpd, }; =20 static ssize_t @@ -685,7 +685,7 @@ static const struct bin_attribute sysfs_sfp_attr =3D { .mode =3D S_IRUSR | S_IWUSR, }, .size =3D SFP_DEV_SIZE, - .read_new =3D qla2x00_sysfs_read_sfp, + .read =3D qla2x00_sysfs_read_sfp, }; =20 static ssize_t @@ -829,7 +829,7 @@ static const struct bin_attribute sysfs_reset_attr =3D { .mode =3D S_IWUSR, }, .size =3D 0, - .write_new =3D qla2x00_sysfs_write_reset, + .write =3D qla2x00_sysfs_write_reset, }; =20 static ssize_t @@ -872,7 +872,7 @@ static const struct bin_attribute sysfs_issue_logo_attr= =3D { .mode =3D S_IWUSR, }, .size =3D 0, - .write_new =3D qla2x00_issue_logo, + .write =3D qla2x00_issue_logo, }; =20 static ssize_t @@ -935,7 +935,7 @@ static const struct bin_attribute sysfs_xgmac_stats_att= r =3D { .mode =3D S_IRUSR, }, .size =3D 0, - .read_new =3D qla2x00_sysfs_read_xgmac_stats, + .read =3D qla2x00_sysfs_read_xgmac_stats, }; =20 static ssize_t @@ -993,7 +993,7 @@ static const struct bin_attribute sysfs_dcbx_tlv_attr = =3D { .mode =3D S_IRUSR, }, .size =3D 0, - .read_new =3D qla2x00_sysfs_read_dcbx_tlv, + .read =3D qla2x00_sysfs_read_dcbx_tlv, }; =20 static struct sysfs_entry { diff --git a/drivers/scsi/qla4xxx/ql4_attr.c b/drivers/scsi/qla4xxx/ql4_att= r.c index e3f85d6ea0db25d5674ca69475af31a4267e2fdb..84f99ff8e69a8f44719af9246f3= 5a7517bb2947d 100644 --- a/drivers/scsi/qla4xxx/ql4_attr.c +++ b/drivers/scsi/qla4xxx/ql4_attr.c @@ -110,8 +110,8 @@ static const struct bin_attribute sysfs_fw_dump_attr = =3D { .mode =3D S_IRUSR | S_IWUSR, }, .size =3D 0, - .read_new =3D qla4_8xxx_sysfs_read_fw_dump, - .write_new =3D qla4_8xxx_sysfs_write_fw_dump, + .read =3D qla4_8xxx_sysfs_read_fw_dump, + .write =3D qla4_8xxx_sysfs_write_fw_dump, }; =20 static struct sysfs_entry { diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index d772258e29ad257468acd1f7d310084f6792bc84..deba96107d20b987c0f75b0ec9b= 69fef27bb15eb 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -917,7 +917,7 @@ show_vpd_##_page(struct file *filp, struct kobject *kob= j, \ static const struct bin_attribute dev_attr_vpd_##_page =3D { \ .attr =3D {.name =3D __stringify(vpd_##_page), .mode =3D S_IRUGO }, \ .size =3D 0, \ - .read_new =3D show_vpd_##_page, \ + .read =3D show_vpd_##_page, \ }; =20 sdev_vpd_pg_attr(pg83); @@ -949,7 +949,7 @@ static const struct bin_attribute dev_attr_inquiry =3D { .mode =3D S_IRUGO, }, .size =3D 0, - .read_new =3D show_inquiry, + .read =3D show_inquiry, }; =20 static ssize_t diff --git a/drivers/video/fbdev/aty/radeon_base.c b/drivers/video/fbdev/at= y/radeon_base.c index c6c4753f64153e39d7e6aa717831867c26bce87b..e0ac03e052da6c3eaf7566d2500= 8569eb080ddb6 100644 --- a/drivers/video/fbdev/aty/radeon_base.c +++ b/drivers/video/fbdev/aty/radeon_base.c @@ -2227,7 +2227,7 @@ static const struct bin_attribute edid1_attr =3D { .mode =3D 0444, }, .size =3D EDID_LENGTH, - .read_new =3D radeon_show_edid1, + .read =3D radeon_show_edid1, }; =20 static const struct bin_attribute edid2_attr =3D { @@ -2236,7 +2236,7 @@ static const struct bin_attribute edid2_attr =3D { .mode =3D 0444, }, .size =3D EDID_LENGTH, - .read_new =3D radeon_show_edid2, + .read =3D radeon_show_edid2, }; =20 static int radeonfb_pci_register(struct pci_dev *pdev, diff --git a/drivers/video/fbdev/udlfb.c b/drivers/video/fbdev/udlfb.c index acadf0eb450c3d76c05fcb9cc7e7c3f6dd8f31ef..ccede85df1e1af65e93656fc448= 9b24e2b99bf59 100644 --- a/drivers/video/fbdev/udlfb.c +++ b/drivers/video/fbdev/udlfb.c @@ -1482,8 +1482,8 @@ static const struct bin_attribute edid_attr =3D { .attr.name =3D "edid", .attr.mode =3D 0666, .size =3D EDID_LENGTH, - .read_new =3D edid_show, - .write_new =3D edid_store + .read =3D edid_show, + .write =3D edid_store }; =20 static const struct device_attribute fb_device_attrs[] =3D { diff --git a/drivers/virt/coco/guest/tsm-mr.c b/drivers/virt/coco/guest/tsm= -mr.c index feb30af90a2081d54643f75621cdd75b4a7abf76..74465e79be60d6838e628c3ea20= 2d8bdc9831487 100644 --- a/drivers/virt/coco/guest/tsm-mr.c +++ b/drivers/virt/coco/guest/tsm-mr.c @@ -209,12 +209,12 @@ tsm_mr_create_attribute_group(const struct tsm_measur= ements *tm) =20 if (tm->mrs[i].mr_flags & TSM_MR_F_READABLE) { bap->attr.mode |=3D 0444; - bap->read_new =3D tm_digest_read; + bap->read =3D tm_digest_read; } =20 if (tm->mrs[i].mr_flags & TSM_MR_F_WRITABLE) { bap->attr.mode |=3D 0200; - bap->write_new =3D tm_digest_write; + bap->write =3D tm_digest_write; } =20 bap->size =3D tm->mrs[i].mr_size; diff --git a/drivers/w1/slaves/w1_ds2406.c b/drivers/w1/slaves/w1_ds2406.c index 76026d6151111ca6e8cc50723567a780f7c38d85..efb2e784f8d7412c260c8e51ed9= 57ae080cc3c7f 100644 --- a/drivers/w1/slaves/w1_ds2406.c +++ b/drivers/w1/slaves/w1_ds2406.c @@ -94,7 +94,7 @@ static const struct bin_attribute w1_f12_sysfs_bin_files[= NB_SYSFS_BIN_FILES] =3D { .mode =3D 0444, }, .size =3D 1, - .read_new =3D w1_f12_read_state, + .read =3D w1_f12_read_state, }, { .attr =3D { @@ -102,7 +102,7 @@ static const struct bin_attribute w1_f12_sysfs_bin_file= s[NB_SYSFS_BIN_FILES] =3D { .mode =3D 0664, }, .size =3D 1, - .write_new =3D w1_f12_write_output, + .write =3D w1_f12_write_output, } }; =20 diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c index 22331d840ec18ae5fa6dfe7bd3437d8bb47057ad..a53eb34fea79fc7d815a6451b4a= e4320eed2ea56 100644 --- a/drivers/w1/slaves/w1_ds2433.c +++ b/drivers/w1/slaves/w1_ds2433.c @@ -276,15 +276,15 @@ static ssize_t eeprom_write(struct file *filp, struct= kobject *kobj, =20 static const struct bin_attribute bin_attr_f23_eeprom =3D { .attr =3D { .name =3D "eeprom", .mode =3D 0644 }, - .read_new =3D eeprom_read, - .write_new =3D eeprom_write, + .read =3D eeprom_read, + .write =3D eeprom_write, .size =3D W1_EEPROM_DS2433_SIZE, }; =20 static const struct bin_attribute bin_attr_f43_eeprom =3D { .attr =3D { .name =3D "eeprom", .mode =3D 0644 }, - .read_new =3D eeprom_read, - .write_new =3D eeprom_write, + .read =3D eeprom_read, + .write =3D eeprom_write, .size =3D W1_EEPROM_DS28EC20_SIZE, }; =20 diff --git a/drivers/w1/slaves/w1_ds2805.c b/drivers/w1/slaves/w1_ds2805.c index 6ee895640d4ac781281e48ed01d9cb20cb71637c..9c86b7985d0bd60ea8a1a13de6c= 080ab35e8a957 100644 --- a/drivers/w1/slaves/w1_ds2805.c +++ b/drivers/w1/slaves/w1_ds2805.c @@ -267,8 +267,8 @@ static const struct bin_attribute w1_f0d_bin_attr =3D { .mode =3D 0644, }, .size =3D W1_F0D_EEPROM_SIZE, - .read_new =3D w1_f0d_read_bin, - .write_new =3D w1_f0d_write_bin, + .read =3D w1_f0d_read_bin, + .write =3D w1_f0d_write_bin, }; =20 static int w1_f0d_add_slave(struct w1_slave *sl) diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c index 10aedcd21363442b2048ad4b0bebdbfd8c8ad30e..294d3642a2795eaa26e5e4b8fdf= 841aef18fb8b2 100644 --- a/drivers/zorro/zorro-sysfs.c +++ b/drivers/zorro/zorro-sysfs.c @@ -104,7 +104,7 @@ static const struct bin_attribute zorro_config_attr =3D= { .mode =3D S_IRUGO, }, .size =3D sizeof(struct ConfigDev), - .read_new =3D zorro_read_config, + .read =3D zorro_read_config, }; =20 static const struct bin_attribute *const zorro_device_bin_attrs[] =3D { diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 1d2cf898e21e32c58490753fa6bc39b8d78e356a..e8e63bd025c7a4dba0cc1fce594= 78e24027ea39f 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -8183,7 +8183,7 @@ static int btf_module_notify(struct notifier_block *n= b, unsigned long op, attr->attr.mode =3D 0444; attr->size =3D btf->data_size; attr->private =3D btf->data; - attr->read_new =3D sysfs_bin_attr_simple_read; + attr->read =3D sysfs_bin_attr_simple_read; =20 err =3D sysfs_create_bin_file(btf_kobj, attr); if (err) { diff --git a/kernel/bpf/sysfs_btf.c b/kernel/bpf/sysfs_btf.c index 941d0d2427e3a2d27e8f1cff7b6424d0d41817c1..8951d8a2f2a3cc955f9dfdecf96= f49e821447175 100644 --- a/kernel/bpf/sysfs_btf.c +++ b/kernel/bpf/sysfs_btf.c @@ -45,7 +45,7 @@ static int btf_sysfs_vmlinux_mmap(struct file *filp, stru= ct kobject *kobj, =20 static struct bin_attribute bin_attr_btf_vmlinux __ro_after_init =3D { .attr =3D { .name =3D "vmlinux", .mode =3D 0444, }, - .read_new =3D sysfs_bin_attr_simple_read, + .read =3D sysfs_bin_attr_simple_read, .mmap =3D btf_sysfs_vmlinux_mmap, }; =20 diff --git a/kernel/module/sysfs.c b/kernel/module/sysfs.c index b401ff4b02d2904d3b5fca93e10e188ddcbaf787..5183ae86e05ee7f1833568e7b41= 9c91e2e9b91fc 100644 --- a/kernel/module/sysfs.c +++ b/kernel/module/sysfs.c @@ -101,7 +101,7 @@ static int add_sect_attrs(struct module *mod, const str= uct load_info *info) ret =3D -ENOMEM; goto out; } - sattr->read_new =3D module_sect_read; + sattr->read =3D module_sect_read; sattr->private =3D (void *)sec->sh_addr; sattr->size =3D MODULE_SECT_READ_SIZE; sattr->attr.mode =3D 0400; @@ -190,7 +190,7 @@ static int add_notes_attrs(struct module *mod, const st= ruct load_info *info) nattr->attr.mode =3D 0444; nattr->size =3D info->sechdrs[i].sh_size; nattr->private =3D (void *)info->sechdrs[i].sh_addr; - nattr->read_new =3D sysfs_bin_attr_simple_read; + nattr->read =3D sysfs_bin_attr_simple_read; *(gattr++) =3D nattr++; } ++loaded; diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index c1176a5e02c43ce32cb3dc152e9aa08eb535a419..cb4855ed950077274f90d7b4c86= 3c18b1384097f 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c @@ -1026,7 +1026,7 @@ static ssize_t brforward_read(struct file *filp, stru= ct kobject *kobj, static const struct bin_attribute bridge_forward =3D { .attr =3D { .name =3D SYSFS_BRIDGE_FDB, .mode =3D 0444, }, - .read_new =3D brforward_read, + .read =3D brforward_read, }; =20 /* --=20 2.49.0 From nobody Wed Feb 11 05:28:56 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F4A31DE88C for ; Fri, 30 May 2025 04:03:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577815; cv=none; b=WW9l0WicIe3BPPBMiPQWTtSHGRELVHJmDvyQhXhaJnebnwBmaLZrv39r11JMeHR0QH04GPOyVS95X8mT79qVMgdk5eehDaLGdA8dW9q7O4dYj4OUP/1ms5JMADtgK1BVPeyrwPcwegoMYSg/FOSICZ0dNqVXw0KRdXJxl3gnw30= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577815; c=relaxed/simple; bh=eAu0U5Klqvc7tRBdl2Mdni3Wjy3EAmOY+KbuV5j0eTc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QkBe5+Rlot4PT//rGlHXMSkSU/dSD5IKWsA44el2buFpBK/zmWHLf0xf0QGIcxMM+bnS9+PfA/QvyAhDw31UTDg9nk/l2/MG67Hh2aCwDmc2OelMekDH7AT54NJt5AU54QTMbRcFi3ON2pr2MkcceBWnzAfVqug1TlUR57Z+bVA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=DgqXRFzU; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="DgqXRFzU" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1748577803; bh=eAu0U5Klqvc7tRBdl2Mdni3Wjy3EAmOY+KbuV5j0eTc=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=DgqXRFzU3Snz88+EIqONLXP7DfUUflI2dk14rpsOCKNSH4rcK19buEMOGje5uoTxL GhRRRCnSyM5STE4UBuSONLnTj2NxSbkruXzJKp/4rJgG8lbxdEK1wLZYNoDdeEQj70 uHv5OA8KvqlwsYJnGZxtUSl+MOfv8Q1NHI/tt938= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Fri, 30 May 2025 05:54:38 +0200 Subject: [PATCH v3 4/6] sysfs: treewide: switch back to attribute_group::bin_attrs Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250530-sysfs-const-bin_attr-final-v3-4-724bfcf05b99@weissschuh.net> References: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> In-Reply-To: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich Cc: linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1748577802; l=49366; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=eAu0U5Klqvc7tRBdl2Mdni3Wjy3EAmOY+KbuV5j0eTc=; b=L18fdiXXTJpgW24doxp5FG79uRNWhIMjJKqMJs5EiC4Wfc3Z/zlW25cIBwpLcN7qZAq9QJKBu tRFMKhNkkA+B1dWp4awPL1iFsNk5SGuPfZtkwADkiCwAAMSKOzTwOIx X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= 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=C3=9Fschuh --- arch/powerpc/kernel/secvar-sysfs.c | 2 +- arch/powerpc/perf/hv-24x7.c | 2 +- arch/powerpc/platforms/powernv/opal-core.c | 2 +- arch/s390/kernel/cpacf.c | 2 +- arch/s390/kernel/ipl.c | 18 +++++++++--------- arch/s390/pci/pci_sysfs.c | 2 +- arch/x86/kernel/ksysfs.c | 4 ++-- drivers/accel/habanalabs/common/sysfs.c | 2 +- drivers/acpi/bgrt.c | 2 +- drivers/base/devcoredump.c | 2 +- drivers/base/firmware_loader/sysfs.c | 2 +- drivers/base/node.c | 2 +- drivers/base/topology.c | 2 +- drivers/cxl/port.c | 2 +- drivers/firmware/google/cbmem.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 2 +- drivers/gpu/drm/drm_sysfs.c | 2 +- drivers/hid/hid-core.c | 2 +- drivers/hid/hid-roccat-arvo.c | 2 +- drivers/hid/hid-roccat-isku.c | 2 +- drivers/hid/hid-roccat-kone.c | 2 +- drivers/hid/hid-roccat-koneplus.c | 2 +- drivers/hid/hid-roccat-konepure.c | 2 +- drivers/hid/hid-roccat-kovaplus.c | 2 +- drivers/hid/hid-roccat-pyra.c | 2 +- drivers/hid/hid-roccat-ryos.c | 2 +- drivers/hid/hid-roccat-savu.c | 2 +- drivers/iio/imu/bno055/bno055.c | 2 +- drivers/infiniband/hw/hfi1/sysfs.c | 2 +- drivers/infiniband/hw/qib/qib_sysfs.c | 2 +- drivers/input/touchscreen/goodix_berlin_core.c | 2 +- drivers/leds/led-class.c | 2 +- drivers/misc/c2port/core.c | 2 +- drivers/mtd/spi-nor/sysfs.c | 2 +- drivers/nvmem/core.c | 4 ++-- drivers/pci/p2pdma.c | 2 +- drivers/pci/pci-sysfs.c | 4 ++-- drivers/pci/vpd.c | 2 +- drivers/platform/chrome/cros_ec_vbc.c | 2 +- drivers/platform/x86/amd/hsmp/acpi.c | 2 +- drivers/platform/x86/amd/hsmp/plat.c | 2 +- drivers/platform/x86/dell/dcdbas.c | 2 +- drivers/platform/x86/dell/dell_rbu.c | 2 +- drivers/platform/x86/intel/sdsi.c | 2 +- drivers/platform/x86/wmi-bmof.c | 2 +- drivers/power/supply/ds2760_battery.c | 2 +- drivers/power/supply/ds2780_battery.c | 2 +- drivers/power/supply/ds2781_battery.c | 2 +- drivers/power/supply/olpc_battery.c | 2 +- drivers/ptp/ptp_ocp.c | 2 +- drivers/rapidio/rio-sysfs.c | 2 +- drivers/s390/cio/chp.c | 2 +- drivers/s390/crypto/pkey_sysfs.c | 8 ++++---- drivers/scsi/scsi_sysfs.c | 2 +- drivers/usb/core/sysfs.c | 2 +- drivers/usb/usbip/vudc_sysfs.c | 2 +- drivers/virt/coco/guest/tsm-mr.c | 4 ++-- drivers/w1/slaves/w1_ds2408.c | 2 +- drivers/w1/slaves/w1_ds2413.c | 2 +- drivers/w1/slaves/w1_ds2430.c | 2 +- drivers/w1/slaves/w1_ds2431.c | 2 +- drivers/w1/slaves/w1_ds2433.c | 4 ++-- drivers/w1/slaves/w1_ds2438.c | 2 +- drivers/w1/slaves/w1_ds2780.c | 2 +- drivers/w1/slaves/w1_ds2781.c | 2 +- drivers/w1/slaves/w1_ds28e04.c | 2 +- drivers/w1/w1.c | 2 +- drivers/zorro/zorro-sysfs.c | 2 +- kernel/module/sysfs.c | 10 +++++----- mm/page_idle.c | 2 +- 71 files changed, 91 insertions(+), 91 deletions(-) diff --git a/arch/powerpc/kernel/secvar-sysfs.c b/arch/powerpc/kernel/secva= r-sysfs.c index afb690a172b4e281830d0dd18785f70e0a967d13..ec900bce0257feedf721a954e90= 43e65fddc48ff 100644 --- a/arch/powerpc/kernel/secvar-sysfs.c +++ b/arch/powerpc/kernel/secvar-sysfs.c @@ -121,7 +121,7 @@ static struct attribute *secvar_attrs[] =3D { =20 static const struct attribute_group secvar_attr_group =3D { .attrs =3D secvar_attrs, - .bin_attrs_new =3D secvar_bin_attrs, + .bin_attrs =3D secvar_bin_attrs, }; __ATTRIBUTE_GROUPS(secvar_attr); =20 diff --git a/arch/powerpc/perf/hv-24x7.c b/arch/powerpc/perf/hv-24x7.c index b0768f3d289300826dcd454a8e397a943572fd45..681cf85af2b327785acfa64bfce= 13c37cabacba3 100644 --- a/arch/powerpc/perf/hv-24x7.c +++ b/arch/powerpc/perf/hv-24x7.c @@ -1141,7 +1141,7 @@ static struct attribute *if_attrs[] =3D { =20 static const struct attribute_group if_group =3D { .name =3D "interface", - .bin_attrs_new =3D if_bin_attrs, + .bin_attrs =3D if_bin_attrs, .attrs =3D if_attrs, }; =20 diff --git a/arch/powerpc/platforms/powernv/opal-core.c b/arch/powerpc/plat= forms/powernv/opal-core.c index 6fe121aae4053d3f28fe07e12a3219e2e79758ad..784602a48afba5c4e5447bcda00= f05f991769cbb 100644 --- a/arch/powerpc/platforms/powernv/opal-core.c +++ b/arch/powerpc/platforms/powernv/opal-core.c @@ -607,7 +607,7 @@ static const struct bin_attribute *const mpipl_bin_attr= [] =3D { =20 static const struct attribute_group mpipl_group =3D { .attrs =3D mpipl_attr, - .bin_attrs_new =3D mpipl_bin_attr, + .bin_attrs =3D mpipl_bin_attr, }; =20 static int __init opalcore_init(void) diff --git a/arch/s390/kernel/cpacf.c b/arch/s390/kernel/cpacf.c index 4b9b34f95d729806d416279b93ccb5a20e4406a7..3bebc47beeab680c53a713fee14= 35e22125eab3c 100644 --- a/arch/s390/kernel/cpacf.c +++ b/arch/s390/kernel/cpacf.c @@ -101,7 +101,7 @@ static const struct bin_attribute *const cpacf_attrs[] = =3D { =20 static const struct attribute_group cpacf_attr_grp =3D { .name =3D "cpacf", - .bin_attrs_new =3D cpacf_attrs, + .bin_attrs =3D cpacf_attrs, }; =20 static int __init cpacf_init(void) diff --git a/arch/s390/kernel/ipl.c b/arch/s390/kernel/ipl.c index ff15f91affdea4bf3d80f76b1c188ea491804e46..961a3d60a4dddabddabf196b308= 90681f3604504 100644 --- a/arch/s390/kernel/ipl.c +++ b/arch/s390/kernel/ipl.c @@ -596,7 +596,7 @@ static struct attribute *ipl_fcp_attrs[] =3D { =20 static const struct attribute_group ipl_fcp_attr_group =3D { .attrs =3D ipl_fcp_attrs, - .bin_attrs_new =3D ipl_fcp_bin_attrs, + .bin_attrs =3D ipl_fcp_bin_attrs, }; =20 static struct attribute *ipl_nvme_attrs[] =3D { @@ -610,7 +610,7 @@ static struct attribute *ipl_nvme_attrs[] =3D { =20 static const struct attribute_group ipl_nvme_attr_group =3D { .attrs =3D ipl_nvme_attrs, - .bin_attrs_new =3D ipl_nvme_bin_attrs, + .bin_attrs =3D ipl_nvme_bin_attrs, }; =20 static struct attribute *ipl_eckd_attrs[] =3D { @@ -623,7 +623,7 @@ static struct attribute *ipl_eckd_attrs[] =3D { =20 static const struct attribute_group ipl_eckd_attr_group =3D { .attrs =3D ipl_eckd_attrs, - .bin_attrs_new =3D ipl_eckd_bin_attrs, + .bin_attrs =3D ipl_eckd_bin_attrs, }; =20 /* CCW ipl device attributes */ @@ -920,7 +920,7 @@ static struct attribute *reipl_fcp_attrs[] =3D { =20 static const struct attribute_group reipl_fcp_attr_group =3D { .attrs =3D reipl_fcp_attrs, - .bin_attrs_new =3D reipl_fcp_bin_attrs, + .bin_attrs =3D reipl_fcp_bin_attrs, }; =20 static struct kobj_attribute sys_reipl_fcp_clear_attr =3D @@ -958,7 +958,7 @@ static struct attribute *reipl_nvme_attrs[] =3D { =20 static const struct attribute_group reipl_nvme_attr_group =3D { .attrs =3D reipl_nvme_attrs, - .bin_attrs_new =3D reipl_nvme_bin_attrs + .bin_attrs =3D reipl_nvme_bin_attrs }; =20 static ssize_t reipl_nvme_clear_show(struct kobject *kobj, @@ -1051,7 +1051,7 @@ static struct attribute *reipl_eckd_attrs[] =3D { =20 static const struct attribute_group reipl_eckd_attr_group =3D { .attrs =3D reipl_eckd_attrs, - .bin_attrs_new =3D reipl_eckd_bin_attrs + .bin_attrs =3D reipl_eckd_bin_attrs }; =20 static ssize_t reipl_eckd_clear_show(struct kobject *kobj, @@ -1596,7 +1596,7 @@ static const struct bin_attribute *const dump_fcp_bin= _attrs[] =3D { static const struct attribute_group dump_fcp_attr_group =3D { .name =3D IPL_FCP_STR, .attrs =3D dump_fcp_attrs, - .bin_attrs_new =3D dump_fcp_bin_attrs, + .bin_attrs =3D dump_fcp_bin_attrs, }; =20 /* NVME dump device attributes */ @@ -1630,7 +1630,7 @@ static const struct bin_attribute *const dump_nvme_bi= n_attrs[] =3D { static const struct attribute_group dump_nvme_attr_group =3D { .name =3D IPL_NVME_STR, .attrs =3D dump_nvme_attrs, - .bin_attrs_new =3D dump_nvme_bin_attrs, + .bin_attrs =3D dump_nvme_bin_attrs, }; =20 /* ECKD dump device attributes */ @@ -1664,7 +1664,7 @@ static const struct bin_attribute *const dump_eckd_bi= n_attrs[] =3D { static const struct attribute_group dump_eckd_attr_group =3D { .name =3D IPL_ECKD_STR, .attrs =3D dump_eckd_attrs, - .bin_attrs_new =3D dump_eckd_bin_attrs, + .bin_attrs =3D dump_eckd_bin_attrs, }; =20 /* CCW dump device attributes */ diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c index 0ecad08e1b1eeb444b712cc69cbf18ed328060b9..0ee0924cfab7e5d22468fb197ee= 78cac679d8c13 100644 --- a/arch/s390/pci/pci_sysfs.c +++ b/arch/s390/pci/pci_sysfs.c @@ -218,7 +218,7 @@ static struct attribute *zpci_dev_attrs[] =3D { =20 const struct attribute_group zpci_attr_group =3D { .attrs =3D zpci_dev_attrs, - .bin_attrs_new =3D zpci_bin_attrs, + .bin_attrs =3D zpci_bin_attrs, }; =20 static struct attribute *pfip_attrs[] =3D { diff --git a/arch/x86/kernel/ksysfs.c b/arch/x86/kernel/ksysfs.c index 4ee7fd9dd69c46cf9a0e9205585d3f898122db96..d547de9b3ed80c85536cbd11a52= 327be383d545e 100644 --- a/arch/x86/kernel/ksysfs.c +++ b/arch/x86/kernel/ksysfs.c @@ -56,7 +56,7 @@ static const struct bin_attribute *const boot_params_data= _attrs[] =3D { =20 static const struct attribute_group boot_params_attr_group =3D { .attrs =3D boot_params_version_attrs, - .bin_attrs_new =3D boot_params_data_attrs, + .bin_attrs =3D boot_params_data_attrs, }; =20 static int kobj_to_setup_data_nr(struct kobject *kobj, int *nr) @@ -265,7 +265,7 @@ static const struct bin_attribute *const setup_data_dat= a_attrs[] =3D { =20 static const struct attribute_group setup_data_attr_group =3D { .attrs =3D setup_data_type_attrs, - .bin_attrs_new =3D setup_data_data_attrs, + .bin_attrs =3D setup_data_data_attrs, }; =20 static int __init create_setup_data_node(struct kobject *parent, diff --git a/drivers/accel/habanalabs/common/sysfs.c b/drivers/accel/habana= labs/common/sysfs.c index 678585cfef848b4222aac82c80a7d39a4148efb2..82f66520ec18b9f07c029c3d62d= 202057cad706a 100644 --- a/drivers/accel/habanalabs/common/sysfs.c +++ b/drivers/accel/habanalabs/common/sysfs.c @@ -479,7 +479,7 @@ static const struct bin_attribute *const hl_dev_bin_att= rs[] =3D { =20 static struct attribute_group hl_dev_attr_group =3D { .attrs =3D hl_dev_attrs, - .bin_attrs_new =3D hl_dev_bin_attrs, + .bin_attrs =3D hl_dev_bin_attrs, }; =20 static struct attribute_group hl_dev_clks_attr_group; diff --git a/drivers/acpi/bgrt.c b/drivers/acpi/bgrt.c index 35ece8e9f15d1d15c224fb6879d48730898fa3df..0fdd581ef96fb6aedf2a881527a= 01142de3dfccf 100644 --- a/drivers/acpi/bgrt.c +++ b/drivers/acpi/bgrt.c @@ -47,7 +47,7 @@ static const struct bin_attribute *const bgrt_bin_attribu= tes[] =3D { =20 static const struct attribute_group bgrt_attribute_group =3D { .attrs =3D bgrt_attributes, - .bin_attrs_new =3D bgrt_bin_attributes, + .bin_attrs =3D bgrt_bin_attributes, }; =20 int __init acpi_parse_bgrt(struct acpi_table_header *table) diff --git a/drivers/base/devcoredump.c b/drivers/base/devcoredump.c index 03a39c417dc41730e040e3d36ba8ee379f6086f7..37faf6156d7c88d8d9b11b0b817= 47a220fc53e07 100644 --- a/drivers/base/devcoredump.c +++ b/drivers/base/devcoredump.c @@ -140,7 +140,7 @@ static const struct bin_attribute *const devcd_dev_bin_= attrs[] =3D { }; =20 static const struct attribute_group devcd_dev_group =3D { - .bin_attrs_new =3D devcd_dev_bin_attrs, + .bin_attrs =3D devcd_dev_bin_attrs, }; =20 static const struct attribute_group *devcd_dev_groups[] =3D { diff --git a/drivers/base/firmware_loader/sysfs.c b/drivers/base/firmware_l= oader/sysfs.c index c9b1564616f451d3913f2a3d07a2b20ffe2e39f3..add0b9b75eddc99132c9650cd7e= 3b132e40504bd 100644 --- a/drivers/base/firmware_loader/sysfs.c +++ b/drivers/base/firmware_loader/sysfs.c @@ -381,7 +381,7 @@ static const struct bin_attribute *const fw_dev_bin_att= rs[] =3D { =20 static const struct attribute_group fw_dev_attr_group =3D { .attrs =3D fw_dev_attrs, - .bin_attrs_new =3D fw_dev_bin_attrs, + .bin_attrs =3D fw_dev_bin_attrs, #ifdef CONFIG_FW_UPLOAD .is_visible =3D fw_upload_is_visible, #endif diff --git a/drivers/base/node.c b/drivers/base/node.c index c19094481630d8e87e39b6bef8685bca6f760c51..9328b81c2f471bbc647970cdee7= a30e087714483 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -597,7 +597,7 @@ static const struct bin_attribute *node_dev_bin_attrs[]= =3D { =20 static const struct attribute_group node_dev_group =3D { .attrs =3D node_dev_attrs, - .bin_attrs_new =3D node_dev_bin_attrs, + .bin_attrs =3D node_dev_bin_attrs, }; =20 static const struct attribute_group *node_dev_groups[] =3D { diff --git a/drivers/base/topology.c b/drivers/base/topology.c index 8b42df05feffada71febacf6693efc043fb356c0..c890e2a5b42801ed018f2a93eba= 13febb233cbce 100644 --- a/drivers/base/topology.c +++ b/drivers/base/topology.c @@ -179,7 +179,7 @@ static umode_t topology_is_visible(struct kobject *kobj, =20 static const struct attribute_group topology_attr_group =3D { .attrs =3D default_attrs, - .bin_attrs_new =3D bin_attrs, + .bin_attrs =3D bin_attrs, .is_visible =3D topology_is_visible, .name =3D "topology" }; diff --git a/drivers/cxl/port.c b/drivers/cxl/port.c index fe4b593331da050bab9503063a334c12149ac25f..cf32dc50b7a61c3a9dd3f6a8f1b= ff80d26454f0d 100644 --- a/drivers/cxl/port.c +++ b/drivers/cxl/port.c @@ -181,7 +181,7 @@ static const struct bin_attribute *const cxl_cdat_bin_a= ttributes[] =3D { }; =20 static const struct attribute_group cxl_cdat_attribute_group =3D { - .bin_attrs_new =3D cxl_cdat_bin_attributes, + .bin_attrs =3D cxl_cdat_bin_attributes, .is_bin_visible =3D cxl_port_bin_attr_is_visible, }; =20 diff --git a/drivers/firmware/google/cbmem.c b/drivers/firmware/google/cbme= m.c index 773d05078e0ae0763591a6d9cfa0d55ea5fff611..54c3b8b05e5d633b1185b22cf3a= 0a693eaa6f7c2 100644 --- a/drivers/firmware/google/cbmem.c +++ b/drivers/firmware/google/cbmem.c @@ -86,7 +86,7 @@ static const struct bin_attribute *const bin_attrs[] =3D { =20 static const struct attribute_group cbmem_entry_group =3D { .attrs =3D attrs, - .bin_attrs_new =3D bin_attrs, + .bin_attrs =3D bin_attrs, }; =20 static const struct attribute_group *dev_groups[] =3D { diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_psp.c index be9f03bbcb36c5a6c7a355c677c3b6f4c255f96f..41c150ae4143857ef66a2a2ec41= cdda4edbb43d9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c @@ -4181,7 +4181,7 @@ static umode_t amdgpu_bin_flash_attr_is_visible(struc= t kobject *kobj, =20 const struct attribute_group amdgpu_flash_attr_group =3D { .attrs =3D flash_attrs, - .bin_attrs_new =3D bin_flash_attrs, + .bin_attrs =3D bin_flash_attrs, .is_bin_visible =3D amdgpu_bin_flash_attr_is_visible, .is_visible =3D amdgpu_flash_attr_is_visible, }; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/= amdgpu/amdgpu_ras.c index de0944947eaf1e52c9f544fc3096fd9cc383d7d1..9c8829bd5a58ca504a27dc32f56= b926b5f26611c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c @@ -2124,7 +2124,7 @@ static int amdgpu_ras_fs_init(struct amdgpu_device *a= dev) con->badpages_attr =3D bin_attr_gpu_vram_bad_pages; sysfs_bin_attr_init(&con->badpages_attr); bin_attrs[0] =3D &con->badpages_attr; - group.bin_attrs_new =3D bin_attrs; + group.bin_attrs =3D bin_attrs; } =20 r =3D sysfs_create_group(&adev->dev->kobj, &group); diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c index 8d27ba7f0d83bcb5d32789cf46b4beec5a5715f6..a455c56dbbeb7774a6eb6b779de= 5f43cb261a12c 100644 --- a/drivers/gpu/drm/drm_sysfs.c +++ b/drivers/gpu/drm/drm_sysfs.c @@ -329,7 +329,7 @@ static const struct bin_attribute *const connector_bin_= attrs[] =3D { =20 static const struct attribute_group connector_dev_group =3D { .attrs =3D connector_dev_attrs, - .bin_attrs_new =3D connector_bin_attrs, + .bin_attrs =3D connector_bin_attrs, }; =20 static const struct attribute_group *connector_dev_groups[] =3D { diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index b348d0464314ca331da073128f0ec4e0a6a91ed1..b10a28a7554665028f9693cf7c1= e07661e52d836 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c @@ -2812,7 +2812,7 @@ static const struct bin_attribute *hid_dev_bin_attrs[= ] =3D { }; static const struct attribute_group hid_dev_group =3D { .attrs =3D hid_dev_attrs, - .bin_attrs_new =3D hid_dev_bin_attrs, + .bin_attrs =3D hid_dev_bin_attrs, }; __ATTRIBUTE_GROUPS(hid_dev); =20 diff --git a/drivers/hid/hid-roccat-arvo.c b/drivers/hid/hid-roccat-arvo.c index 3048297569c529d4ac8be5a26e75e0640e7cd53a..7b09adfa44a1ded5bc6940a853f= 0087345b24656 100644 --- a/drivers/hid/hid-roccat-arvo.c +++ b/drivers/hid/hid-roccat-arvo.c @@ -258,7 +258,7 @@ static const struct bin_attribute *const arvo_bin_attri= butes[] =3D { =20 static const struct attribute_group arvo_group =3D { .attrs =3D arvo_attrs, - .bin_attrs_new =3D arvo_bin_attributes, + .bin_attrs =3D arvo_bin_attributes, }; =20 static const struct attribute_group *arvo_groups[] =3D { diff --git a/drivers/hid/hid-roccat-isku.c b/drivers/hid/hid-roccat-isku.c index 9fddc42f241b21328b58efa43ac6d1213b494ab1..339378771ed506a87ea4328e299= 774dc93363854 100644 --- a/drivers/hid/hid-roccat-isku.c +++ b/drivers/hid/hid-roccat-isku.c @@ -238,7 +238,7 @@ static const struct bin_attribute *const isku_bin_attri= butes[] =3D { =20 static const struct attribute_group isku_group =3D { .attrs =3D isku_attrs, - .bin_attrs_new =3D isku_bin_attributes, + .bin_attrs =3D isku_bin_attributes, }; =20 static const struct attribute_group *isku_groups[] =3D { diff --git a/drivers/hid/hid-roccat-kone.c b/drivers/hid/hid-roccat-kone.c index af8ef42aca02809a934c3efe1b3c7eb8fbc4da54..fabc08efcfd8cbeac97a95ff937= 836b1da662719 100644 --- a/drivers/hid/hid-roccat-kone.c +++ b/drivers/hid/hid-roccat-kone.c @@ -646,7 +646,7 @@ static const struct bin_attribute *const kone_bin_attri= butes[] =3D { =20 static const struct attribute_group kone_group =3D { .attrs =3D kone_attrs, - .bin_attrs_new =3D kone_bin_attributes, + .bin_attrs =3D kone_bin_attributes, }; =20 static const struct attribute_group *kone_groups[] =3D { diff --git a/drivers/hid/hid-roccat-koneplus.c b/drivers/hid/hid-roccat-kon= eplus.c index c3f01f7b7e488d2aa21bf82a37601035fe3970a9..77d45d36421a6e108a355f0d9e9= 364f1ab7152a7 100644 --- a/drivers/hid/hid-roccat-koneplus.c +++ b/drivers/hid/hid-roccat-koneplus.c @@ -346,7 +346,7 @@ static const struct bin_attribute *const koneplus_bin_a= ttributes[] =3D { =20 static const struct attribute_group koneplus_group =3D { .attrs =3D koneplus_attrs, - .bin_attrs_new =3D koneplus_bin_attributes, + .bin_attrs =3D koneplus_bin_attributes, }; =20 static const struct attribute_group *koneplus_groups[] =3D { diff --git a/drivers/hid/hid-roccat-konepure.c b/drivers/hid/hid-roccat-kon= epure.c index 7fb705789d4eca6c9eeab9b2fc2a1f615bad747e..027bfc55ef9ceacf3d476c8a3ac= 3472591fcb7e1 100644 --- a/drivers/hid/hid-roccat-konepure.c +++ b/drivers/hid/hid-roccat-konepure.c @@ -62,7 +62,7 @@ static const struct bin_attribute *const konepure_bin_att= rs[] =3D { }; =20 static const struct attribute_group konepure_group =3D { - .bin_attrs_new =3D konepure_bin_attrs, + .bin_attrs =3D konepure_bin_attrs, }; =20 static const struct attribute_group *konepure_groups[] =3D { diff --git a/drivers/hid/hid-roccat-kovaplus.c b/drivers/hid/hid-roccat-kov= aplus.c index 7d625ed53c9f4b82490bc5b76a8e8263e4c8cadc..a66f1b4730f30ab269c1df572d4= ae630076fc5f5 100644 --- a/drivers/hid/hid-roccat-kovaplus.c +++ b/drivers/hid/hid-roccat-kovaplus.c @@ -399,7 +399,7 @@ static const struct bin_attribute *const kovaplus_bin_a= ttributes[] =3D { =20 static const struct attribute_group kovaplus_group =3D { .attrs =3D kovaplus_attrs, - .bin_attrs_new =3D kovaplus_bin_attributes, + .bin_attrs =3D kovaplus_bin_attributes, }; =20 static const struct attribute_group *kovaplus_groups[] =3D { diff --git a/drivers/hid/hid-roccat-pyra.c b/drivers/hid/hid-roccat-pyra.c index dbb9055853696bafad6266872f18819b5560a6c3..de2da6086e0b93080c4ba21b7b0= 437992adcc478 100644 --- a/drivers/hid/hid-roccat-pyra.c +++ b/drivers/hid/hid-roccat-pyra.c @@ -355,7 +355,7 @@ static const struct bin_attribute *const pyra_bin_attri= butes[] =3D { =20 static const struct attribute_group pyra_group =3D { .attrs =3D pyra_attrs, - .bin_attrs_new =3D pyra_bin_attributes, + .bin_attrs =3D pyra_bin_attributes, }; =20 static const struct attribute_group *pyra_groups[] =3D { diff --git a/drivers/hid/hid-roccat-ryos.c b/drivers/hid/hid-roccat-ryos.c index 902dac1e714e16936d8ab7881b183b732cb1c110..36911c9da4fe30a1f6026577f9f= 16c78732f48f9 100644 --- a/drivers/hid/hid-roccat-ryos.c +++ b/drivers/hid/hid-roccat-ryos.c @@ -70,7 +70,7 @@ static const struct bin_attribute *const ryos_bin_attrs[]= =3D { }; =20 static const struct attribute_group ryos_group =3D { - .bin_attrs_new =3D ryos_bin_attrs, + .bin_attrs =3D ryos_bin_attrs, }; =20 static const struct attribute_group *ryos_groups[] =3D { diff --git a/drivers/hid/hid-roccat-savu.c b/drivers/hid/hid-roccat-savu.c index 7399b8ffb5c7cae8110c8fb1a93f8b645f54f2eb..fb2e464c3ada8dea8b0f6b88167= 9720f0dd37751 100644 --- a/drivers/hid/hid-roccat-savu.c +++ b/drivers/hid/hid-roccat-savu.c @@ -42,7 +42,7 @@ static const struct bin_attribute *const savu_bin_attrs[]= =3D { }; =20 static const struct attribute_group savu_group =3D { - .bin_attrs_new =3D savu_bin_attrs, + .bin_attrs =3D savu_bin_attrs, }; =20 static const struct attribute_group *savu_groups[] =3D { diff --git a/drivers/iio/imu/bno055/bno055.c b/drivers/iio/imu/bno055/bno05= 5.c index 597c402b98dedf0c43248642e34748e9274b2e9d..574657db13f6fa2c3b7cc0cc626= f7cc700d12932 100644 --- a/drivers/iio/imu/bno055/bno055.c +++ b/drivers/iio/imu/bno055/bno055.c @@ -1357,7 +1357,7 @@ static const struct bin_attribute *const bno055_bin_a= ttrs[] =3D { =20 static const struct attribute_group bno055_attrs_group =3D { .attrs =3D bno055_attrs, - .bin_attrs_new =3D bno055_bin_attrs, + .bin_attrs =3D bno055_bin_attrs, }; =20 static const struct iio_info bno055_info =3D { diff --git a/drivers/infiniband/hw/hfi1/sysfs.c b/drivers/infiniband/hw/hfi= 1/sysfs.c index d94216c7d576f6418140e0d096314633aa42ab3b..372cfd13dc6160dd8905b8aa80e= 5ae953e576958 100644 --- a/drivers/infiniband/hw/hfi1/sysfs.c +++ b/drivers/infiniband/hw/hfi1/sysfs.c @@ -134,7 +134,7 @@ static struct attribute *port_cc_attributes[] =3D { static const struct attribute_group port_cc_group =3D { .name =3D "CCMgtA", .attrs =3D port_cc_attributes, - .bin_attrs_new =3D port_cc_bin_attributes, + .bin_attrs =3D port_cc_bin_attributes, }; =20 /* Start sc2vl */ diff --git a/drivers/infiniband/hw/qib/qib_sysfs.c b/drivers/infiniband/hw/= qib/qib_sysfs.c index 805e37dc7621179c94320759f8259144950c2e68..a6571bc38366e6884622c50c9d0= 7c418b6ed9bb8 100644 --- a/drivers/infiniband/hw/qib/qib_sysfs.c +++ b/drivers/infiniband/hw/qib/qib_sysfs.c @@ -295,7 +295,7 @@ static umode_t qib_ccmgta_is_bin_visible(struct kobject= *kobj, static const struct attribute_group port_ccmgta_attribute_group =3D { .name =3D "CCMgtA", .is_bin_visible =3D qib_ccmgta_is_bin_visible, - .bin_attrs_new =3D port_ccmgta_attributes, + .bin_attrs =3D port_ccmgta_attributes, }; =20 /* Start sl2vl */ diff --git a/drivers/input/touchscreen/goodix_berlin_core.c b/drivers/input= /touchscreen/goodix_berlin_core.c index 02a1d9a465f25b151ff4f38fed39931431363f07..c78d512d97cdb1612f484e44570= 0090dd321a4c1 100644 --- a/drivers/input/touchscreen/goodix_berlin_core.c +++ b/drivers/input/touchscreen/goodix_berlin_core.c @@ -707,7 +707,7 @@ static const struct bin_attribute *const goodix_berlin_= bin_attrs[] =3D { }; =20 static const struct attribute_group goodix_berlin_attr_group =3D { - .bin_attrs_new =3D goodix_berlin_bin_attrs, + .bin_attrs =3D goodix_berlin_bin_attrs, }; =20 const struct attribute_group *goodix_berlin_groups[] =3D { diff --git a/drivers/leds/led-class.c b/drivers/leds/led-class.c index c20ac8ccf52b7d79762a3aeea446389bad8443ea..58592593b8e953f17b0d2227b2d= 24f1a0383c2cc 100644 --- a/drivers/leds/led-class.c +++ b/drivers/leds/led-class.c @@ -91,7 +91,7 @@ static const struct bin_attribute *const led_trigger_bin_= attrs[] =3D { NULL, }; static const struct attribute_group led_trigger_group =3D { - .bin_attrs_new =3D led_trigger_bin_attrs, + .bin_attrs =3D led_trigger_bin_attrs, }; #endif =20 diff --git a/drivers/misc/c2port/core.c b/drivers/misc/c2port/core.c index fc64474b8241b73df4937bd4bac5593fbb96016c..babdb60cc46c00cc9930a2dbe9c= 2f14a683fcb5b 100644 --- a/drivers/misc/c2port/core.c +++ b/drivers/misc/c2port/core.c @@ -888,7 +888,7 @@ static size_t c2port_bin_attr_size(struct kobject *kobj, =20 static const struct attribute_group c2port_group =3D { .attrs =3D c2port_attrs, - .bin_attrs_new =3D c2port_bin_attrs, + .bin_attrs =3D c2port_bin_attrs, .bin_size =3D c2port_bin_attr_size, }; =20 diff --git a/drivers/mtd/spi-nor/sysfs.c b/drivers/mtd/spi-nor/sysfs.c index 4f12ff755df06cee04125efd5036245c51b49af4..643513ee891b7e5e1213a9be137= 024558a036117 100644 --- a/drivers/mtd/spi-nor/sysfs.c +++ b/drivers/mtd/spi-nor/sysfs.c @@ -104,7 +104,7 @@ static const struct attribute_group spi_nor_sysfs_group= =3D { .is_visible =3D spi_nor_sysfs_is_visible, .is_bin_visible =3D spi_nor_sysfs_is_bin_visible, .attrs =3D spi_nor_sysfs_entries, - .bin_attrs_new =3D spi_nor_sysfs_bin_entries, + .bin_attrs =3D spi_nor_sysfs_bin_entries, }; =20 const struct attribute_group *spi_nor_sysfs_groups[] =3D { diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index f0a664bcb01a0b43fb6ea9cd62cb01211277b931..1cd962312fa8ed1dd2ccba79d85= 2f19db9196643 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -386,7 +386,7 @@ static const struct bin_attribute *const nvmem_bin_attr= ibutes[] =3D { }; =20 static const struct attribute_group nvmem_bin_group =3D { - .bin_attrs_new =3D nvmem_bin_attributes, + .bin_attrs =3D nvmem_bin_attributes, .attrs =3D nvmem_attrs, .is_bin_visible =3D nvmem_bin_attr_is_visible, .bin_size =3D nvmem_bin_attr_size, @@ -503,7 +503,7 @@ static int nvmem_populate_sysfs_cells(struct nvmem_devi= ce *nvmem) i++; } =20 - group.bin_attrs_new =3D pattrs; + group.bin_attrs =3D pattrs; =20 ret =3D device_add_group(&nvmem->dev, &group); if (ret) diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c index 8d955c25aed36142258f82e0a6f8e803946392f4..da5657a020074e4ad59d3763ef6= 298f251d545a4 100644 --- a/drivers/pci/p2pdma.c +++ b/drivers/pci/p2pdma.c @@ -196,7 +196,7 @@ static const struct bin_attribute *const p2pmem_bin_att= rs[] =3D { =20 static const struct attribute_group p2pmem_group =3D { .attrs =3D p2pmem_attrs, - .bin_attrs_new =3D p2pmem_bin_attrs, + .bin_attrs =3D p2pmem_bin_attrs, .name =3D "p2pmem", }; =20 diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index f2739eafef9bf1578a08beb67387865537ab6a3e..5eea14c1f7f5f704d43eed7e3a6= d6136a4920679 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c @@ -857,7 +857,7 @@ static size_t pci_dev_config_attr_bin_size(struct kobje= ct *kobj, } =20 static const struct attribute_group pci_dev_config_attr_group =3D { - .bin_attrs_new =3D pci_dev_config_attrs, + .bin_attrs =3D pci_dev_config_attrs, .bin_size =3D pci_dev_config_attr_bin_size, }; =20 @@ -1377,7 +1377,7 @@ static size_t pci_dev_rom_attr_bin_size(struct kobjec= t *kobj, } =20 static const struct attribute_group pci_dev_rom_attr_group =3D { - .bin_attrs_new =3D pci_dev_rom_attrs, + .bin_attrs =3D pci_dev_rom_attrs, .is_bin_visible =3D pci_dev_rom_attr_is_visible, .bin_size =3D pci_dev_rom_attr_bin_size, }; diff --git a/drivers/pci/vpd.c b/drivers/pci/vpd.c index 3d29b2602d0fb760b81c374036a506a4ddb4b281..153394a652d33a80db150c826be= d348fb4fc542e 100644 --- a/drivers/pci/vpd.c +++ b/drivers/pci/vpd.c @@ -336,7 +336,7 @@ static umode_t vpd_attr_is_visible(struct kobject *kobj, } =20 const struct attribute_group pci_dev_vpd_attr_group =3D { - .bin_attrs_new =3D vpd_attrs, + .bin_attrs =3D vpd_attrs, .is_bin_visible =3D vpd_attr_is_visible, }; =20 diff --git a/drivers/platform/chrome/cros_ec_vbc.c b/drivers/platform/chrom= e/cros_ec_vbc.c index 963c4db23055d8fd807ec72072b1ae0a95c1bbb0..5ee8adaa6564ea56ba2d5efea5c= 8b4eac1db8f5a 100644 --- a/drivers/platform/chrome/cros_ec_vbc.c +++ b/drivers/platform/chrome/cros_ec_vbc.c @@ -108,7 +108,7 @@ static const struct bin_attribute *const cros_ec_vbc_bi= n_attrs[] =3D { =20 static const struct attribute_group cros_ec_vbc_attr_group =3D { .name =3D "vbc", - .bin_attrs_new =3D cros_ec_vbc_bin_attrs, + .bin_attrs =3D cros_ec_vbc_bin_attrs, }; =20 static int cros_ec_vbc_probe(struct platform_device *pd) diff --git a/drivers/platform/x86/amd/hsmp/acpi.c b/drivers/platform/x86/am= d/hsmp/acpi.c index 63af9dae02542cc4736c01559e18cebbf42a7e71..9155ce35a743767fadde66f7bd1= bc92224143615 100644 --- a/drivers/platform/x86/amd/hsmp/acpi.c +++ b/drivers/platform/x86/amd/hsmp/acpi.c @@ -560,7 +560,7 @@ static struct attribute *hsmp_dev_attr_list[] =3D { }; =20 static const struct attribute_group hsmp_attr_grp =3D { - .bin_attrs_new =3D hsmp_attr_list, + .bin_attrs =3D hsmp_attr_list, .attrs =3D hsmp_dev_attr_list, .is_bin_visible =3D hsmp_is_sock_attr_visible, .is_visible =3D hsmp_is_sock_dev_attr_visible, diff --git a/drivers/platform/x86/amd/hsmp/plat.c b/drivers/platform/x86/am= d/hsmp/plat.c index b6dceca28bdb99dd5f83a7354cd22d8c7faaa684..e257fb0f41433fa9466e2ec57db= be3bce810c394 100644 --- a/drivers/platform/x86/amd/hsmp/plat.c +++ b/drivers/platform/x86/amd/hsmp/plat.c @@ -110,7 +110,7 @@ HSMP_BIN_ATTR(7, *sock7_attr_list); =20 #define HSMP_BIN_ATTR_GRP(index, _list, _name) \ static const struct attribute_group sock##index##_attr_grp =3D { \ - .bin_attrs_new =3D _list, \ + .bin_attrs =3D _list, \ .is_bin_visible =3D hsmp_is_sock_attr_visible, \ .name =3D #_name, \ } diff --git a/drivers/platform/x86/dell/dcdbas.c b/drivers/platform/x86/dell= /dcdbas.c index 8149be25fa267ca027d809c45fe1c3f47fcfd453..678f44252a4537ec0ad9388ff3a= eeeaf1075c870 100644 --- a/drivers/platform/x86/dell/dcdbas.c +++ b/drivers/platform/x86/dell/dcdbas.c @@ -662,7 +662,7 @@ static struct attribute *dcdbas_dev_attrs[] =3D { =20 static const struct attribute_group dcdbas_attr_group =3D { .attrs =3D dcdbas_dev_attrs, - .bin_attrs_new =3D dcdbas_bin_attrs, + .bin_attrs =3D dcdbas_bin_attrs, }; =20 static int dcdbas_probe(struct platform_device *dev) diff --git a/drivers/platform/x86/dell/dell_rbu.c b/drivers/platform/x86/de= ll/dell_rbu.c index e30ca325938cb604560a810e7d63f65b4b70964b..d74f2d47917cdf0846a6d27c24c= aae5ff27066d3 100644 --- a/drivers/platform/x86/dell/dell_rbu.c +++ b/drivers/platform/x86/dell/dell_rbu.c @@ -636,7 +636,7 @@ static const struct bin_attribute *const rbu_bin_attrs[= ] =3D { }; =20 static const struct attribute_group rbu_group =3D { - .bin_attrs_new =3D rbu_bin_attrs, + .bin_attrs =3D rbu_bin_attrs, }; =20 static int __init dcdrbu_init(void) diff --git a/drivers/platform/x86/intel/sdsi.c b/drivers/platform/x86/intel= /sdsi.c index 30d1c2caf9842dbc355e7dea19f6446c56421228..da75f53d0bcc02dadbaf7740ac3= b6ce4d4d4fe73 100644 --- a/drivers/platform/x86/intel/sdsi.c +++ b/drivers/platform/x86/intel/sdsi.c @@ -576,7 +576,7 @@ static struct attribute *sdsi_attrs[] =3D { =20 static const struct attribute_group sdsi_group =3D { .attrs =3D sdsi_attrs, - .bin_attrs_new =3D sdsi_bin_attrs, + .bin_attrs =3D sdsi_bin_attrs, .is_bin_visible =3D sdsi_battr_is_visible, }; __ATTRIBUTE_GROUPS(sdsi); diff --git a/drivers/platform/x86/wmi-bmof.c b/drivers/platform/x86/wmi-bmo= f.c index 3e33da36da8ada3648b58b2579181fd2cd4bfff3..5b00370a9a22c3255329305f9e0= 439838d3b9a4d 100644 --- a/drivers/platform/x86/wmi-bmof.c +++ b/drivers/platform/x86/wmi-bmof.c @@ -46,7 +46,7 @@ static size_t bmof_bin_size(struct kobject *kobj, const s= truct bin_attribute *at =20 static const struct attribute_group bmof_group =3D { .bin_size =3D bmof_bin_size, - .bin_attrs_new =3D bmof_attrs, + .bin_attrs =3D bmof_attrs, }; =20 static const struct attribute_group *bmof_groups[] =3D { diff --git a/drivers/power/supply/ds2760_battery.c b/drivers/power/supply/d= s2760_battery.c index 5badf58c6edbce46208da1084607613df1d59e83..142c7492c3c22e09dec2fda33a3= 671cd20c6071c 100644 --- a/drivers/power/supply/ds2760_battery.c +++ b/drivers/power/supply/ds2760_battery.c @@ -209,7 +209,7 @@ static const struct bin_attribute *const w1_ds2760_bin_= attrs[] =3D { }; =20 static const struct attribute_group w1_ds2760_group =3D { - .bin_attrs_new =3D w1_ds2760_bin_attrs, + .bin_attrs =3D w1_ds2760_bin_attrs, }; =20 static const struct attribute_group *w1_ds2760_groups[] =3D { diff --git a/drivers/power/supply/ds2780_battery.c b/drivers/power/supply/d= s2780_battery.c index 8352c6401cbfab1ea03a3f946d13e05cbb190b37..5b57bbba79d449f4620a5188af1= 480b9a58c7837 100644 --- a/drivers/power/supply/ds2780_battery.c +++ b/drivers/power/supply/ds2780_battery.c @@ -734,7 +734,7 @@ static const struct bin_attribute *const ds2780_sysfs_b= in_attrs[] =3D { =20 static const struct attribute_group ds2780_sysfs_group =3D { .attrs =3D ds2780_sysfs_attrs, - .bin_attrs_new =3D ds2780_sysfs_bin_attrs, + .bin_attrs =3D ds2780_sysfs_bin_attrs, }; =20 static const struct attribute_group *ds2780_sysfs_groups[] =3D { diff --git a/drivers/power/supply/ds2781_battery.c b/drivers/power/supply/d= s2781_battery.c index 43a6b022901e39fd1aedfc744dc84b64451de2cb..1319e02f3f95e9641c7aa4f6f5d= e43b586dcd351 100644 --- a/drivers/power/supply/ds2781_battery.c +++ b/drivers/power/supply/ds2781_battery.c @@ -737,7 +737,7 @@ static const struct bin_attribute *const ds2781_sysfs_b= in_attrs[] =3D { =20 static const struct attribute_group ds2781_sysfs_group =3D { .attrs =3D ds2781_sysfs_attrs, - .bin_attrs_new =3D ds2781_sysfs_bin_attrs, + .bin_attrs =3D ds2781_sysfs_bin_attrs, =20 }; =20 diff --git a/drivers/power/supply/olpc_battery.c b/drivers/power/supply/olp= c_battery.c index a9760dbb16163ffebab218d951662ab5e3331d11..202c4fa9b90392f65745ff35d11= 6ace5f38f21d0 100644 --- a/drivers/power/supply/olpc_battery.c +++ b/drivers/power/supply/olpc_battery.c @@ -591,7 +591,7 @@ static const struct bin_attribute *const olpc_bat_sysfs= _bin_attrs[] =3D { =20 static const struct attribute_group olpc_bat_sysfs_group =3D { .attrs =3D olpc_bat_sysfs_attrs, - .bin_attrs_new =3D olpc_bat_sysfs_bin_attrs, + .bin_attrs =3D olpc_bat_sysfs_bin_attrs, }; =20 static const struct attribute_group *olpc_bat_sysfs_groups[] =3D { diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c index ce804438c32d18572de220340aac4d5e2e495788..d3b341c339c82616d9d3e987063= ec25cc02c5a9a 100644 --- a/drivers/ptp/ptp_ocp.c +++ b/drivers/ptp/ptp_ocp.c @@ -3938,7 +3938,7 @@ static const struct bin_attribute *const bin_art_time= card_attrs[] =3D { =20 static const struct attribute_group art_timecard_group =3D { .attrs =3D art_timecard_attrs, - .bin_attrs_new =3D bin_art_timecard_attrs, + .bin_attrs =3D bin_art_timecard_attrs, }; =20 static const struct ocp_attr_group art_timecard_groups[] =3D { diff --git a/drivers/rapidio/rio-sysfs.c b/drivers/rapidio/rio-sysfs.c index 5e8c22677e460c4a774f36e90c50930b2a0e8987..0949c869b2f11de99ad80b93711= 27791a8ce297f 100644 --- a/drivers/rapidio/rio-sysfs.c +++ b/drivers/rapidio/rio-sysfs.c @@ -278,7 +278,7 @@ static umode_t rio_dev_is_attr_visible(struct kobject *= kobj, static const struct attribute_group rio_dev_group =3D { .attrs =3D rio_dev_attrs, .is_visible =3D rio_dev_is_attr_visible, - .bin_attrs_new =3D rio_dev_bin_attrs, + .bin_attrs =3D rio_dev_bin_attrs, }; =20 const struct attribute_group *rio_dev_groups[] =3D { diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c index 4f01b1929240eb1f31f3b51875b18c8343548df8..caa300160b1756c5d22f53cf07f= 04cd5d4646c13 100644 --- a/drivers/s390/cio/chp.c +++ b/drivers/s390/cio/chp.c @@ -470,7 +470,7 @@ static struct attribute *chp_attrs[] =3D { }; static const struct attribute_group chp_attr_group =3D { .attrs =3D chp_attrs, - .bin_attrs_new =3D chp_bin_attrs, + .bin_attrs =3D chp_bin_attrs, }; static const struct attribute_group *chp_attr_groups[] =3D { &chp_attr_group, diff --git a/drivers/s390/crypto/pkey_sysfs.c b/drivers/s390/crypto/pkey_sy= sfs.c index cea77297364911097b1fd6a3bc64188a368529cd..792c0fce88fa04baba4d075d145= 835a626d00fb8 100644 --- a/drivers/s390/crypto/pkey_sysfs.c +++ b/drivers/s390/crypto/pkey_sysfs.c @@ -297,7 +297,7 @@ static const struct bin_attribute *const protkey_attrs[= ] =3D { =20 static const struct attribute_group protkey_attr_group =3D { .name =3D "protkey", - .bin_attrs_new =3D protkey_attrs, + .bin_attrs =3D protkey_attrs, }; =20 /* @@ -406,7 +406,7 @@ static const struct bin_attribute *const ccadata_attrs[= ] =3D { =20 static const struct attribute_group ccadata_attr_group =3D { .name =3D "ccadata", - .bin_attrs_new =3D ccadata_attrs, + .bin_attrs =3D ccadata_attrs, }; =20 #define CCACIPHERTOKENSIZE (sizeof(struct cipherkeytoken) + 80) @@ -520,7 +520,7 @@ static const struct bin_attribute *const ccacipher_attr= s[] =3D { =20 static const struct attribute_group ccacipher_attr_group =3D { .name =3D "ccacipher", - .bin_attrs_new =3D ccacipher_attrs, + .bin_attrs =3D ccacipher_attrs, }; =20 /* @@ -635,7 +635,7 @@ static const struct bin_attribute *const ep11_attrs[] = =3D { =20 static const struct attribute_group ep11_attr_group =3D { .name =3D "ep11", - .bin_attrs_new =3D ep11_attrs, + .bin_attrs =3D ep11_attrs, }; =20 const struct attribute_group *pkey_attr_groups[] =3D { diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index deba96107d20b987c0f75b0ec9b69fef27bb15eb..169af7d47ce76ba5e33fd5db2e9= 4a35c53a42a8a 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c @@ -1362,7 +1362,7 @@ static const struct bin_attribute *const scsi_sdev_bi= n_attrs[] =3D { }; static struct attribute_group scsi_sdev_attr_group =3D { .attrs =3D scsi_sdev_attrs, - .bin_attrs_new =3D scsi_sdev_bin_attrs, + .bin_attrs =3D scsi_sdev_bin_attrs, .is_visible =3D scsi_sdev_attr_is_visible, .is_bin_visible =3D scsi_sdev_bin_attr_is_visible, }; diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index 23f3cb1989f408ecb6b679e6cbe4857384188ae4..a07866f1060cf4f2ba336d80218= f8102cdcdef2d 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c @@ -944,7 +944,7 @@ static umode_t dev_bin_attrs_are_visible(struct kobject= *kobj, } =20 static const struct attribute_group dev_bin_attr_grp =3D { - .bin_attrs_new =3D dev_bin_attrs, + .bin_attrs =3D dev_bin_attrs, .is_bin_visible =3D dev_bin_attrs_are_visible, }; =20 diff --git a/drivers/usb/usbip/vudc_sysfs.c b/drivers/usb/usbip/vudc_sysfs.c index 2aae3edfc81369e3f84aadec7050356a4347c104..47f3a7d51736cb09f835473dfe6= 83b45e7114c5f 100644 --- a/drivers/usb/usbip/vudc_sysfs.c +++ b/drivers/usb/usbip/vudc_sysfs.c @@ -259,7 +259,7 @@ static const struct bin_attribute *const dev_bin_attrs[= ] =3D { =20 static const struct attribute_group vudc_attr_group =3D { .attrs =3D dev_attrs, - .bin_attrs_new =3D dev_bin_attrs, + .bin_attrs =3D dev_bin_attrs, }; =20 const struct attribute_group *vudc_groups[] =3D { diff --git a/drivers/virt/coco/guest/tsm-mr.c b/drivers/virt/coco/guest/tsm= -mr.c index 74465e79be60d6838e628c3ea202d8bdc9831487..bc509df04db1d0351b0fb78ceeb= a28feeeb7201c 100644 --- a/drivers/virt/coco/guest/tsm-mr.c +++ b/drivers/virt/coco/guest/tsm-mr.c @@ -228,7 +228,7 @@ tsm_mr_create_attribute_group(const struct tsm_measurem= ents *tm) =20 init_rwsem(&ctx->rwsem); ctx->agrp.name =3D "measurements"; - ctx->agrp.bin_attrs_new =3D no_free_ptr(attrs); + ctx->agrp.bin_attrs =3D no_free_ptr(attrs); ctx->tm =3D tm; 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) { 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)); } } diff --git a/drivers/w1/slaves/w1_ds2408.c b/drivers/w1/slaves/w1_ds2408.c index beccd2912d2aeb9a5f83cabba19c32946778a790..30d1d574d2e5de749e71fbb9203= 537c589657ec7 100644 --- a/drivers/w1/slaves/w1_ds2408.c +++ b/drivers/w1/slaves/w1_ds2408.c @@ -328,7 +328,7 @@ static const struct bin_attribute *const w1_f29_bin_att= rs[] =3D { }; =20 static const struct attribute_group w1_f29_group =3D { - .bin_attrs_new =3D w1_f29_bin_attrs, + .bin_attrs =3D w1_f29_bin_attrs, }; =20 static const struct attribute_group *w1_f29_groups[] =3D { diff --git a/drivers/w1/slaves/w1_ds2413.c b/drivers/w1/slaves/w1_ds2413.c index 5fa46017ca7cd8ae8ff657adaa9ed0e83f5d0e8b..94d3cd2a0ec9723c8dc1510039a= b55075cd7efe8 100644 --- a/drivers/w1/slaves/w1_ds2413.c +++ b/drivers/w1/slaves/w1_ds2413.c @@ -137,7 +137,7 @@ static const struct bin_attribute *const w1_f3a_bin_att= rs[] =3D { }; =20 static const struct attribute_group w1_f3a_group =3D { - .bin_attrs_new =3D w1_f3a_bin_attrs, + .bin_attrs =3D w1_f3a_bin_attrs, }; =20 static const struct attribute_group *w1_f3a_groups[] =3D { diff --git a/drivers/w1/slaves/w1_ds2430.c b/drivers/w1/slaves/w1_ds2430.c index ff56e2e68e583b3bb4df82c119e9325271342595..3d8c2b238aed3c9c1bbe683a96b= 36303d408a881 100644 --- a/drivers/w1/slaves/w1_ds2430.c +++ b/drivers/w1/slaves/w1_ds2430.c @@ -271,7 +271,7 @@ static const struct bin_attribute *const w1_f14_bin_att= rs[] =3D { }; =20 static const struct attribute_group w1_f14_group =3D { - .bin_attrs_new =3D w1_f14_bin_attrs, + .bin_attrs =3D w1_f14_bin_attrs, }; =20 static const struct attribute_group *w1_f14_groups[] =3D { diff --git a/drivers/w1/slaves/w1_ds2431.c b/drivers/w1/slaves/w1_ds2431.c index 27b390fb59da11b610e1d126347ddba46a2f4f29..5749880b67c534ef085ae41bf93= 98272ad9de4bd 100644 --- a/drivers/w1/slaves/w1_ds2431.c +++ b/drivers/w1/slaves/w1_ds2431.c @@ -270,7 +270,7 @@ static const struct bin_attribute *const w1_f2d_bin_att= rs[] =3D { }; =20 static const struct attribute_group w1_f2d_group =3D { - .bin_attrs_new =3D w1_f2d_bin_attrs, + .bin_attrs =3D w1_f2d_bin_attrs, }; =20 static const struct attribute_group *w1_f2d_groups[] =3D { diff --git a/drivers/w1/slaves/w1_ds2433.c b/drivers/w1/slaves/w1_ds2433.c index a53eb34fea79fc7d815a6451b4ae4320eed2ea56..3371d804dc6cadb2426856c7a8a= 56a97883d0dc4 100644 --- a/drivers/w1/slaves/w1_ds2433.c +++ b/drivers/w1/slaves/w1_ds2433.c @@ -294,7 +294,7 @@ static const struct bin_attribute *const w1_f23_bin_att= ributes[] =3D { }; =20 static const struct attribute_group w1_f23_group =3D { - .bin_attrs_new =3D w1_f23_bin_attributes, + .bin_attrs =3D w1_f23_bin_attributes, }; =20 static const struct attribute_group *w1_f23_groups[] =3D { @@ -308,7 +308,7 @@ static const struct bin_attribute *const w1_f43_bin_att= ributes[] =3D { }; =20 static const struct attribute_group w1_f43_group =3D { - .bin_attrs_new =3D w1_f43_bin_attributes, + .bin_attrs =3D w1_f43_bin_attributes, }; =20 static const struct attribute_group *w1_f43_groups[] =3D { diff --git a/drivers/w1/slaves/w1_ds2438.c b/drivers/w1/slaves/w1_ds2438.c index 630a6db5045e8c2985cae6fef684bb6f2081f95d..86860f727e9621a418f55123aad= fabfe0cc15247 100644 --- a/drivers/w1/slaves/w1_ds2438.c +++ b/drivers/w1/slaves/w1_ds2438.c @@ -492,7 +492,7 @@ static const struct bin_attribute *const w1_ds2438_bin_= attrs[] =3D { }; =20 static const struct attribute_group w1_ds2438_group =3D { - .bin_attrs_new =3D w1_ds2438_bin_attrs, + .bin_attrs =3D w1_ds2438_bin_attrs, }; =20 static const struct attribute_group *w1_ds2438_groups[] =3D { diff --git a/drivers/w1/slaves/w1_ds2780.c b/drivers/w1/slaves/w1_ds2780.c index ba7beb7b01f98d631d61c44847540068ece4bdd6..889a6099c314e09464ee943abb3= 600e4c4bc50f9 100644 --- a/drivers/w1/slaves/w1_ds2780.c +++ b/drivers/w1/slaves/w1_ds2780.c @@ -103,7 +103,7 @@ static const struct bin_attribute *const w1_ds2780_bin_= attrs[] =3D { }; =20 static const struct attribute_group w1_ds2780_group =3D { - .bin_attrs_new =3D w1_ds2780_bin_attrs, + .bin_attrs =3D w1_ds2780_bin_attrs, }; =20 static const struct attribute_group *w1_ds2780_groups[] =3D { diff --git a/drivers/w1/slaves/w1_ds2781.c b/drivers/w1/slaves/w1_ds2781.c index acd04ee96e81bd028e026711749649c59e35a141..88f3abd5cd4be4d6a9dd44509d8= d79f4ca553353 100644 --- a/drivers/w1/slaves/w1_ds2781.c +++ b/drivers/w1/slaves/w1_ds2781.c @@ -100,7 +100,7 @@ static const struct bin_attribute *const w1_ds2781_bin_= attrs[] =3D { }; =20 static const struct attribute_group w1_ds2781_group =3D { - .bin_attrs_new =3D w1_ds2781_bin_attrs, + .bin_attrs =3D w1_ds2781_bin_attrs, }; =20 static const struct attribute_group *w1_ds2781_groups[] =3D { diff --git a/drivers/w1/slaves/w1_ds28e04.c b/drivers/w1/slaves/w1_ds28e04.c index d99ffadbe29bb48a5c60239b4d6f4cb0d7a5cb5d..c577b5973032e12cf6108d71899= 595f35656fd0e 100644 --- a/drivers/w1/slaves/w1_ds28e04.c +++ b/drivers/w1/slaves/w1_ds28e04.c @@ -371,7 +371,7 @@ static const struct bin_attribute *const w1_f1C_bin_att= rs[] =3D { =20 static const struct attribute_group w1_f1C_group =3D { .attrs =3D w1_f1C_attrs, - .bin_attrs_new =3D w1_f1C_bin_attrs, + .bin_attrs =3D w1_f1C_bin_attrs, }; =20 static const struct attribute_group *w1_f1C_groups[] =3D { diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 29f200bbab41f41948388635e0f1790ec39ca417..d0474a0532ec1f24f14e5bb7573= 3a9c2fe176c72 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c @@ -149,7 +149,7 @@ static const struct bin_attribute *const w1_slave_bin_a= ttrs[] =3D { }; =20 static const struct attribute_group w1_slave_default_group =3D { - .bin_attrs_new =3D w1_slave_bin_attrs, + .bin_attrs =3D w1_slave_bin_attrs, }; =20 static const struct attribute_group *w1_slave_default_groups[] =3D { diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c index 294d3642a2795eaa26e5e4b8fdf841aef18fb8b2..4e967754d8ad40ca88c2e0729a1= a397254918436 100644 --- a/drivers/zorro/zorro-sysfs.c +++ b/drivers/zorro/zorro-sysfs.c @@ -114,7 +114,7 @@ static const struct bin_attribute *const zorro_device_b= in_attrs[] =3D { =20 static const struct attribute_group zorro_device_attr_group =3D { .attrs =3D zorro_device_attrs, - .bin_attrs_new =3D zorro_device_bin_attrs, + .bin_attrs =3D zorro_device_bin_attrs, }; =20 const struct attribute_group *zorro_device_attribute_groups[] =3D { diff --git a/kernel/module/sysfs.c b/kernel/module/sysfs.c index 5183ae86e05ee7f1833568e7b419c91e2e9b91fc..c7622ff5226a2b6c48ebdfc4c9f= 6aeff7a7437e7 100644 --- a/kernel/module/sysfs.c +++ b/kernel/module/sysfs.c @@ -56,9 +56,9 @@ static void free_sect_attrs(struct module_sect_attrs *sec= t_attrs) { const struct bin_attribute *const *bin_attr; =20 - for (bin_attr =3D sect_attrs->grp.bin_attrs_new; *bin_attr; bin_attr++) + for (bin_attr =3D sect_attrs->grp.bin_attrs; *bin_attr; bin_attr++) kfree((*bin_attr)->attr.name); - kfree(sect_attrs->grp.bin_attrs_new); + kfree(sect_attrs->grp.bin_attrs); kfree(sect_attrs); } =20 @@ -86,7 +86,7 @@ static int add_sect_attrs(struct module *mod, const struc= t load_info *info) =20 /* Setup section attributes. */ sect_attrs->grp.name =3D "sections"; - sect_attrs->grp.bin_attrs_new =3D gattr; + sect_attrs->grp.bin_attrs =3D gattr; =20 sattr =3D §_attrs->attrs[0]; for (i =3D 0; i < info->hdr->e_shnum; i++) { @@ -144,7 +144,7 @@ struct module_notes_attrs { =20 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); } =20 @@ -178,7 +178,7 @@ static int add_notes_attrs(struct module *mod, const st= ruct load_info *info) } =20 notes_attrs->grp.name =3D "notes"; - notes_attrs->grp.bin_attrs_new =3D gattr; + notes_attrs->grp.bin_attrs =3D gattr; =20 nattr =3D ¬es_attrs->attrs[0]; for (loaded =3D i =3D 0; i < info->hdr->e_shnum; ++i) { diff --git a/mm/page_idle.c b/mm/page_idle.c index 408aaf29a3ea62aa85cc5f93a8a9687c1eb8eedb..a82b340dc20447e760889b588cf= 71288525a7275 100644 --- a/mm/page_idle.c +++ b/mm/page_idle.c @@ -208,7 +208,7 @@ static const struct bin_attribute *const page_idle_bin_= attrs[] =3D { }; =20 static const struct attribute_group page_idle_attr_group =3D { - .bin_attrs_new =3D page_idle_bin_attrs, + .bin_attrs =3D page_idle_bin_attrs, .name =3D "page_idle", }; =20 --=20 2.49.0 From nobody Wed Feb 11 05:28:56 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85B7520E034 for ; Fri, 30 May 2025 04:03:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577817; cv=none; b=bKp7UUTJFVNt0CqKiutp370WNTyadK3ke1IBjXc10SLZd+2i6UX2mHCnVuC7YWEopcoaVw+X0YWqqwYkPd+0apHujlHKe9+FNRzHuELHB/Kbzdv3Mj85dLMCWbCeyp4u+Dk2wL+lcpkt8pbFeLkGtXDFvyuYGeEp54HThrDyUrY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577817; c=relaxed/simple; bh=Q2OPQrIO/jaDN/2l0DiXXRSCwM0map7oHs8r7qRwFLo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=NLEHfGazyr+mmw4pRd5PuL/Rvb4zbuhDr22R7i0tHctuGeOeKXYQmT35FsRYeh0kWIWrxbfzz1OM9hpO8fvJQ6uiSkHBCIk+a5yd6mtA+FVvHlQMUrBYWNrA4hP3Gh6C7zfGV+yIzfjdQQlMl3gPGYc+TALSetsD0TsoU7SyPl0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=U4/fsWOc; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="U4/fsWOc" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1748577803; bh=Q2OPQrIO/jaDN/2l0DiXXRSCwM0map7oHs8r7qRwFLo=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=U4/fsWOcAsjK4CsteBhwYSWaHqzVlTN5nTuc66M8Liau+sQaodRhfNSB23Bdqs6kv PhtDElCE+KvI6CBU7UkyfHUy8xMTAUa5hyxbwzZdFoixdCivFVluBfLypZINlaNQ9O nYiEZO29mJzTqmVFtkvFk8KQLs1jKtuVELcvbYsk= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Fri, 30 May 2025 05:54:39 +0200 Subject: [PATCH v3 5/6] sysfs: remove bin_attribute::read_new/write_new() Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250530-sysfs-const-bin_attr-final-v3-5-724bfcf05b99@weissschuh.net> References: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> In-Reply-To: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich Cc: linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1748577802; l=2951; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=Q2OPQrIO/jaDN/2l0DiXXRSCwM0map7oHs8r7qRwFLo=; b=P8NiIQRawpWpqqIkYyXt/8HbuNbrgXEp831Da1FmsNAsDiUm2gkQQZo6GeNsWF71PUdVH4ONU 3jpR4BqP8wHD14Mv+0HvZKCV3qtPGUkU9xd7nFEXqU3X5kel82S4p0f X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= These transitional fields are unnecessary und unused. Remove them and their logic in the sysfs core. Signed-off-by: Thomas Wei=C3=9Fschuh --- fs/sysfs/file.c | 22 +++++----------------- include/linux/sysfs.h | 4 ---- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index 1ca143d2f22ad2d6b0b74b261514f8bc3cb5153c..3825e780cc580df4a1a511d12b3= ee3fa2e6bdb37 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -97,12 +97,9 @@ static ssize_t sysfs_kf_bin_read(struct kernfs_open_file= *of, char *buf, count =3D size - pos; } =20 - if (!battr->read && !battr->read_new) + if (!battr->read) return -EIO; =20 - if (battr->read_new) - return battr->read_new(of->file, kobj, battr, buf, pos, count); - return battr->read(of->file, kobj, battr, buf, pos, count); } =20 @@ -161,12 +158,9 @@ static ssize_t sysfs_kf_bin_write(struct kernfs_open_f= ile *of, char *buf, if (!count) return 0; =20 - if (!battr->write && !battr->write_new) + if (!battr->write) return -EIO; =20 - if (battr->write_new) - return battr->write_new(of->file, kobj, battr, buf, pos, count); - return battr->write(of->file, kobj, battr, buf, pos, count); } =20 @@ -335,19 +329,13 @@ int sysfs_add_bin_file_mode_ns(struct kernfs_node *pa= rent, const struct kernfs_ops *ops; struct kernfs_node *kn; =20 - if (battr->read && battr->read_new) - return -EINVAL; - - if (battr->write && battr->write_new) - return -EINVAL; - if (battr->mmap) ops =3D &sysfs_bin_kfops_mmap; - else if ((battr->read || battr->read_new) && (battr->write || battr->writ= e_new)) + else if (battr->read && battr->write) ops =3D &sysfs_bin_kfops_rw; - else if (battr->read || battr->read_new) + else if (battr->read) ops =3D &sysfs_bin_kfops_ro; - else if (battr->write || battr->write_new) + else if (battr->write) ops =3D &sysfs_bin_kfops_wo; else ops =3D &sysfs_file_kfops_empty; diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index f418aae4f1134f8126783d9e8eb575ba4278e927..7544f6d81c05982b5d168624f37= 6cd647127ab51 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -308,12 +308,8 @@ struct bin_attribute { struct address_space *(*f_mapping)(void); ssize_t (*read)(struct file *, struct kobject *, const struct bin_attribu= te *, char *, loff_t, size_t); - ssize_t (*read_new)(struct file *, struct kobject *, const struct bin_att= ribute *, - char *, loff_t, size_t); ssize_t (*write)(struct file *, struct kobject *, const struct bin_attrib= ute *, char *, loff_t, size_t); - ssize_t (*write_new)(struct file *, struct kobject *, - const struct bin_attribute *, char *, loff_t, size_t); loff_t (*llseek)(struct file *, struct kobject *, const struct bin_attrib= ute *, loff_t, int); int (*mmap)(struct file *, struct kobject *, const struct bin_attribute *= attr, --=20 2.49.0 From nobody Wed Feb 11 05:28:56 2026 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 85C1720E31B for ; Fri, 30 May 2025 04:03:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577817; cv=none; b=IxYiRWPdY0xmDZV5CUXDriSFl18lqS8xXjAA1GZEHIfaHUanXp3ELWoxKPAwsjGFVk7wtQR03oTIJSCxl/kUI3k3LVtlEOX7uIGvuO9J3AH5WQqfk4FsGoW5wlPL00sroi+U+Kwe4xvcNWtR+pXBNeOJejdGXMjDha9sLihlQYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748577817; c=relaxed/simple; bh=dUenq90UtfBa8R0EBUGvlV9x0d9hlq6T8P+rB9uxwWQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=rn6ejtI/sJr6S+GZZlLc2GLrNIMNQGRX+AZzYLh+e1EWZUa1DzA9IqKFB9dZLLutU1Jhgxs2t8MdoBA5lfC+KuUIS0wi5ccau2DPaHP+tV0ojTrfHqgdIueBTnAWPq4NRPEcjyQagtOa+KZ0CORld/ZI5vTamBm0bJXDv2Sjo+w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=Xgtu32J3; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="Xgtu32J3" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1748577803; bh=dUenq90UtfBa8R0EBUGvlV9x0d9hlq6T8P+rB9uxwWQ=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Xgtu32J3ovM8gpTo+yF8DIxOW+22vjx7R8yQ15DjoQR/STBnZZr0DBDf23SSbBYWH a87CuAjMr9C8tIE6o/mBvdtFteM8wTqfhyjS5PRkoGgWfyrhH/rTprRXzuRbKrgJ/e DGZRt81/nl+DlWsx6G2zLFuUCHDOIGrT1YTq/G9I= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Fri, 30 May 2025 05:54:40 +0200 Subject: [PATCH v3 6/6] sysfs: remove attribute_group::bin_attrs_new Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250530-sysfs-const-bin_attr-final-v3-6-724bfcf05b99@weissschuh.net> References: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> In-Reply-To: <20250530-sysfs-const-bin_attr-final-v3-0-724bfcf05b99@weissschuh.net> To: Greg Kroah-Hartman , "Rafael J. Wysocki" , Danilo Krummrich Cc: linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1748577802; l=1064; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=dUenq90UtfBa8R0EBUGvlV9x0d9hlq6T8P+rB9uxwWQ=; b=BdVFIB/ZSb++pscgFyKgGiaXbFsumeHEfkLT1iZ5juVE3Qgxoj3fdsWL5bUUJ/fGdKGlK83+w /1DFV3sUYdzDWhowLoAU3JAQlWuPZLtnTMMgFQe0eEvwlR5on0X00xt X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= This transitional field is unused and unnecessary. Remove it. Signed-off-by: Thomas Wei=C3=9Fschuh --- include/linux/sysfs.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h index 7544f6d81c05982b5d168624f376cd647127ab51..9a25a29116528fab77d667390dd= 3ef5957b86554 100644 --- a/include/linux/sysfs.h +++ b/include/linux/sysfs.h @@ -106,10 +106,7 @@ struct attribute_group { const struct bin_attribute *, int); struct attribute **attrs; - union { - const struct bin_attribute *const *bin_attrs; - const struct bin_attribute *const *bin_attrs_new; - }; + const struct bin_attribute *const *bin_attrs; }; =20 #define SYSFS_PREALLOC 010000 @@ -293,7 +290,7 @@ __ATTRIBUTE_GROUPS(_name) =20 #define BIN_ATTRIBUTE_GROUPS(_name) \ static const struct attribute_group _name##_group =3D { \ - .bin_attrs_new =3D _name##_attrs, \ + .bin_attrs =3D _name##_attrs, \ }; \ __ATTRIBUTE_GROUPS(_name) =20 --=20 2.49.0