Skip to content

Commit

Permalink
RDMA: Use default_groups in kobj_type
Browse files Browse the repository at this point in the history
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
commit aa30f47 ("kobject: Add support for default attribute groups to
kobj_type") so that we can soon get rid of the obsolete default_attrs
field.

Link: https://lore.kernel.org/r/20220103152259.531034-1-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
  • Loading branch information
Greg Kroah-Hartman authored and Jason Gunthorpe committed Jan 5, 2022
1 parent a7ad9dd commit 0109713
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion drivers/infiniband/core/sysfs.c
Original file line number Diff line number Diff line change
@@ -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 = {
3 changes: 2 additions & 1 deletion drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 0109713

Please sign in to comment.