RDMA: use default_groups in kobj_type
Subsystems (2)
PATCH 1/1 RDMA: use default_groups in kobj_type
There are currently 2 ways to create a set of sysfs files for a kobj_type, through the default_attrs field, and the default_groups field. Move the IB code to use default_groups field which has been the preferred way since aa30f47cf666 ("kobject: Add support for default attribute groups to kobj_type") so that we can soon get rid of the obsolete default_attrs field.
--- drivers/infiniband/core/sysfs.c | 3 ++- drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
drivers/infiniband/core/sysfs.c +2 -1
@@ -433,6 +433,7 @@ static struct attribute *port_default_attrs[] = { &ib_port_attr_link_layer.attr, NULL }; +ATTRIBUTE_GROUPS (port_default);static ssize_t print_ndev (const struct ib_gid_attr *gid_attr,char *buf) {
@@ -774,7 +775,7 @@ static void ib_port_gid_attr_release(struct kobject *kobj)static struct kobj_type port_type = { .release = ib_port_release, .sysfs_ops = &port_sysfs_ops, - .default_attrs = port_default_attrs + .default_groups = port_default_groups, };static struct kobj_type gid_attr_type = {
drivers/infiniband/hw/usnic/usnic_ib_sysfs.c +2 -1
@@ -243,10 +243,11 @@ static struct attribute *usnic_ib_qpn_default_attrs[] = { &qpn_attr_summary.attr, NULL }; +ATTRIBUTE_GROUPS (usnic_ib_qpn_default);static struct kobj_type usnic_ib_qpn_type = { .sysfs_ops = &usnic_ib_qpn_sysfs_ops, - .default_attrs = usnic_ib_qpn_default_attrs + .default_groups = usnic_ib_qpn_default_groups, };int usnic_ib_sysfs_register_usdev (struct usnic_ib_dev *us_ibdev)
Signature · 1 line
2.34.1
Quoted 18 lines · Greg Kroah-Hartman
There are currently 2 ways to create a set of sysfs files for a
kobj_type, through thedefault_attrsfield, and thedefault_groupsfield. Move the IB code to usedefault_groupsfield which has been the preferred way sinceaa30f47cf666("kobject: Add support for default attribute groups tokobj_type") so that we can soon get rid of the obsoletedefault_attrsfield.Cc Doug Ledford <[email protected]>Cc Jason Gunthorpe <[email protected]>Cc Christian Benvenuti <[email protected]>Cc Nelson Escobar <[email protected]>Cc Leon Romanovsky <[email protected]>Cc Wenpeng Liang <[email protected]>Cc Mark Zhang <[email protected]>Cc Weihang Li <[email protected]>Cc Aharon Landau <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 5 lines
--- drivers/infiniband/core/sysfs.c | 3 ++- drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
Thanks,
Quoted 19 lines · Greg Kroah-Hartman
There are currently 2 ways to create a set of sysfs files for a
kobj_type, through thedefault_attrsfield, and thedefault_groupsfield. Move the IB code to usedefault_groupsfield which has been the preferred way sinceaa30f47cf666("kobject: Add support for default attribute groups tokobj_type") so that we can soon get rid of the obsoletedefault_attrsfield.Cc Doug Ledford <[email protected]>Cc Jason Gunthorpe <[email protected]>Cc Christian Benvenuti <[email protected]>Cc Nelson Escobar <[email protected]>Cc Leon Romanovsky <[email protected]>Cc Wenpeng Liang <[email protected]>Cc Mark Zhang <[email protected]>Cc Weihang Li <[email protected]>Cc Aharon Landau <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>Reviewed-by Leon Romanovsky <[email protected]>
Quoted 4 lines
--- drivers/infiniband/core/sysfs.c | 3 ++- drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
Applied to for-next, thanks
Jason