Commit c0f4979e authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/cm: Remove unused cm_class 

Previous commits removed all references to the /sys/class/infiniband_cm/
directory represented by the cm_class symbol. Remove the directory and
cm_class.

Fixes: a1a8e4a8 ("rdma: Delete the ib_ucm module")
Link: https://lore.kernel.org/r/0-v1-90096a98c476+205-remove_cm_leftovers_jgg@nvidia.com


Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
parent c97119b6

Documentation/ABI/stable/sysfs-class-infiniband

+0 −17
Original line number Diff line number Diff line
@@ -258,23 +258,6 @@ Description: 
		userspace ABI compatibility of umad & issm devices.





What:		/sys/class/infiniband_cm/ucmN/ibdev

Date:		Oct, 2005

KernelVersion:	v2.6.14

Contact:	linux-rdma@vger.kernel.org

Description:

		(RO) Display Infiniband (IB) device name





What:		/sys/class/infiniband_cm/abi_version

Date:		Oct, 2005

KernelVersion:	v2.6.14

Contact:	linux-rdma@vger.kernel.org

Description:

		(RO) Value is incremented if any changes are made that break

		userspace ABI compatibility of ucm devices.





What:		/sys/class/infiniband_verbs/uverbsN/ibdev

What:		/sys/class/infiniband_verbs/uverbsN/abi_version

Date:		Sept, 2005

drivers/infiniband/core/cm.c

+0 −24
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ static struct attribute *cm_counter_default_attrs[] = { 
struct cm_port {

	struct cm_device *cm_dev;

	struct ib_mad_agent *mad_agent;

	struct kobject port_obj;

	u8 port_num;

	struct list_head cm_priv_prim_list;

	struct list_head cm_priv_altr_list;
@@ -4295,20 +4294,6 @@ static struct kobj_type cm_counter_obj_type = { 
	.default_attrs = cm_counter_default_attrs

};



static char *cm_devnode(struct device *dev, umode_t *mode)

{

	if (mode)

		*mode = 0666;

	return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev));

}



struct class cm_class = {

	.owner   = THIS_MODULE,

	.name    = "infiniband_cm",

	.devnode = cm_devnode,

};

EXPORT_SYMBOL(cm_class);



static int cm_create_port_fs(struct cm_port *port)

{

	int i, ret;
@@ -4511,12 +4496,6 @@ static int __init ib_cm_init(void) 
	get_random_bytes(&cm.random_id_operand, sizeof cm.random_id_operand);

	INIT_LIST_HEAD(&cm.timewait_list);



	ret = class_register(&cm_class);

	if (ret) {

		ret = -ENOMEM;

		goto error1;

	}



	cm.wq = alloc_workqueue("ib_cm", 0, 1);

	if (!cm.wq) {

		ret = -ENOMEM;
@@ -4531,8 +4510,6 @@ static int __init ib_cm_init(void) 
error3:

	destroy_workqueue(cm.wq);

error2:

	class_unregister(&cm_class);

error1:

	return ret;

}
@@ -4553,7 +4530,6 @@ static void __exit ib_cm_cleanup(void) 
		kfree(timewait_info);

	}



	class_unregister(&cm_class);

	WARN_ON(!xa_empty(&cm.local_id_table));

}

include/rdma/ib_cm.h

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 
#include <rdma/ib_sa.h>

#include <rdma/rdma_cm.h>



/* ib_cm and ib_user_cm modules share /sys/class/infiniband_cm */

extern struct class cm_class;



enum ib_cm_state {

	IB_CM_IDLE,

	IB_CM_LISTEN,

CRA Git | Maintained and supported by SUSTech CRA and CCSE