RDMA/hfi1: Remove unused non-user-accessible device class
Subsystems (2)
PATCH 1/1 RDMA/hfi1: Remove unused non-user-accessible device class
The driver defines two device classes: "hfi1" (mode 0600) and "hfi1_user" (mode 0666), selected by a user_accessible parameter to hfi1_cdev_init(). The only caller always passes user_accessible=true, so the "hfi1" class is registered but never used.
The 0600 class was originally used by the diagnostics UI char device (hfi1_ui*), but that was removed over 10 years ago in commit 7312f29d8ee5 ("IB/hfi1: Remove UI char device"). The class and the user_accessible parameter were left behind.
Remove the unused class and the user_accessible parameter.
Now that there's only one class, it might make sense to change its name from "hfi1_user" to just "hfi1", but not knowing whether userspace would mind, keep the name as is.
--- drivers/infiniband/hw/hfi1/device.c | 32 ++------------------------- drivers/infiniband/hw/hfi1/device.h | 1 - drivers/infiniband/hw/hfi1/file_ops.c | 2 +- 3 files changed, 3 insertions(+), 32 deletions(-)
drivers/infiniband/hw/hfi1/device.c +2 -30
@@ -10,18 +10,6 @@#include "hfi.h" #include "device.h" -static char *hfi1_devnode (const struct device *dev,umode_t *mode) -{ -if (mode) - *mode =0600 ; -return kasprintf (GFP_KERNEL ,"%s" ,dev_name (dev)); -} - -static const struct class class = { - .name ="hfi1" , - .devnode = hfi1_devnode, -}; -static char *hfi1_user_devnode (const struct device *dev,umode_t *mode) {if (mode)
@@ -38,7 +26,6 @@ static dev_t hfi1_dev;int hfi1_cdev_init (int minor,const char *name,const struct file_operations *fops,struct cdev *cdev,struct device **devp, -bool user_accessible,struct kobject *parent) {const dev_t dev =MKDEV (MAJOR (hfi1_dev), minor);
@@ -57,10 +44,7 @@ int hfi1_cdev_init(int minor, const char *name, goto done; } -if (user_accessible) - device =device_create (&user_class,NULL , dev,NULL ,"%s" , name); -else - device =device_create (&class,NULL , dev,NULL ,"%s" , name); + device =device_create (&user_class,NULL , dev,NULL ,"%s" , name);if (IS_ERR (device)) { ret =PTR_ERR (device);
@@ -100,33 +84,21 @@ int __init dev_init(void) ret =alloc_chrdev_region (&hfi1_dev,0 ,HFI1_NMINORS ,DRIVER_NAME );if (ret <0 ) {pr_err ("Could not allocate chrdev region (err %d)\n" , -ret); - goto done; - } - - ret =class_register (&class); -if (ret) { -pr_err ("Could not create device class (err %d)\n" , -ret); -unregister_chrdev_region (hfi1_dev,HFI1_NMINORS ); - goto done; +return ret; } ret =class_register (&user_class);if (ret) {pr_err ("Could not create device class for user accessible files (err %d)\n" , -ret); -class_unregister (&class);unregister_chrdev_region (hfi1_dev,HFI1_NMINORS ); - goto done; } -done:return ret; }void dev_cleanup (void ) { -class_unregister (&class);class_unregister (&user_class); -unregister_chrdev_region (hfi1_dev,HFI1_NMINORS ); }
drivers/infiniband/hw/hfi1/device.h +0 -1
@@ -9,7 +9,6 @@int hfi1_cdev_init (int minor,const char *name,const struct file_operations *fops,struct cdev *cdev,struct device **devp, -bool user_accessible,struct kobject *parent);void hfi1_cdev_cleanup (struct cdev *cdev,struct device **devp);const char *class_name (void );
drivers/infiniband/hw/hfi1/file_ops.c +1 -1
@@ -1689,7 +1689,7 @@ static int user_add(struct hfi1_devdata *dd)snprintf (name,sizeof (name),"%s_%d" ,class_name (), dd->unit); ret =hfi1_cdev_init (dd->unit, name, &hfi1_file_ops, &dd->user_cdev, &dd->user_device, - true, &dd->verbs_dev.rdi.ibdev.dev.kobj); + &dd->verbs_dev.rdi.ibdev.dev.kobj);if (ret)user_remove (dd);
Signature · 1 line
2.54.0
Leon Romanovsky
AppliedQuoted 11 lines · Michal Schmidt
The driver defines two device classes: "hfi1" (mode 0600) and "
hfi1_user" (mode 0666), selected by auser_accessibleparameter tohfi1_cdev_init(). The only caller always passes user_accessible=true, so the "hfi1" class is registered but never used.The 0600 class was originally used by the diagnostics UI char device (hfi1_ui*), but that was removed over 10 years ago in commit
7312f29d8ee5("IB/hfi1: Remove UI char device"). The class and theuser_accessibleparameter were left behind.[...]
Applied, thanks!
[1/1] RDMA/hfi1: Remove unused non-user-accessible device class
https://git.kernel.org/rdma/rdma/c/297b5b747a0a2c
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>