| Message ID | 20220103152259.531034-1-gregkh@linuxfoundation.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Jason Gunthorpe |
| Headers | show |
| Series | RDMA: use default_groups in kobj_type | expand |
On Mon, Jan 03, 2022 at 04:22:59PM +0100, Greg Kroah-Hartman wrote: > 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. > > Cc: Doug Ledford <dledford@redhat.com> > Cc: Jason Gunthorpe <jgg@ziepe.ca> > Cc: Christian Benvenuti <benve@cisco.com> > Cc: Nelson Escobar <neescoba@cisco.com> > Cc: Leon Romanovsky <leon@kernel.org> > Cc: Wenpeng Liang <liangwenpeng@huawei.com> > Cc: Mark Zhang <markzhang@nvidia.com> > Cc: Weihang Li <liweihang@huawei.com> > Cc: Aharon Landau <aharonl@nvidia.com> > Cc: linux-rdma@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > drivers/infiniband/core/sysfs.c | 3 ++- > drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) > Thanks, Reviewed-by: Leon Romanovsky <leonro@nvidia.com>
On Mon, Jan 03, 2022 at 04:22:59PM +0100, Greg Kroah-Hartman wrote: > 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. > > Cc: Doug Ledford <dledford@redhat.com> > Cc: Jason Gunthorpe <jgg@ziepe.ca> > Cc: Christian Benvenuti <benve@cisco.com> > Cc: Nelson Escobar <neescoba@cisco.com> > Cc: Leon Romanovsky <leon@kernel.org> > Cc: Wenpeng Liang <liangwenpeng@huawei.com> > Cc: Mark Zhang <markzhang@nvidia.com> > Cc: Weihang Li <liweihang@huawei.com> > Cc: Aharon Landau <aharonl@nvidia.com> > Cc: linux-rdma@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Reviewed-by: Leon Romanovsky <leonro@nvidia.com> > --- > 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
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index a3f84b50c46a..84c53bd2a52d 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c @@ -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 = { diff --git a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c index 586b0e52ba7f..7d868f033bbf 100644 --- a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c +++ b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c @@ -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)
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. Cc: Doug Ledford <dledford@redhat.com> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Christian Benvenuti <benve@cisco.com> Cc: Nelson Escobar <neescoba@cisco.com> Cc: Leon Romanovsky <leon@kernel.org> Cc: Wenpeng Liang <liangwenpeng@huawei.com> Cc: Mark Zhang <markzhang@nvidia.com> Cc: Weihang Li <liweihang@huawei.com> Cc: Aharon Landau <aharonl@nvidia.com> Cc: linux-rdma@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/infiniband/core/sysfs.c | 3 ++- drivers/infiniband/hw/usnic/usnic_ib_sysfs.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)