MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-06 05:45:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rapidio: make all 'class' structures const

Browse Source 
Now that the driver core allows for struct class to be in read-only
memory, making all 'class' structures to be declared at build time
placing them into read-only memory, instead of having to be dynamically
allocated at load time.

Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ivan Orlov <ivan.orlov0322@gmail.com>
Link: https://lore.kernel.org/r/20230810195103.27069-1-ivan.orlov0322@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ivan Orlov 2023-08-10 23:51:03 +04:00 committed by Greg Kroah-Hartman
parent 4f01342464
commit d712d20521
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/rapidio/devices/rio_mport_cdev.c
View File

@ -250,7 +250,9 @@ static DEFINE_MUTEX(mport_devs_lock);
static DECLARE_WAIT_QUEUE_HEAD(mport_cdev_wait); static DECLARE_WAIT_QUEUE_HEAD(mport_cdev_wait);
#endif #endif
static struct class *dev_class; static const struct class dev_class = {
.name = DRV_NAME,
};
static dev_t dev_number; static dev_t dev_number;
static void mport_release_mapping(struct kref *ref); static void mport_release_mapping(struct kref *ref);
@ -2379,7 +2381,7 @@ static struct mport_dev *mport_cdev_add(struct rio_mport *mport)
device_initialize(&md->dev); device_initialize(&md->dev);
md->dev.devt = MKDEV(MAJOR(dev_number), mport->id); md->dev.devt = MKDEV(MAJOR(dev_number), mport->id);
md->dev.class = dev_class; md->dev.class = &dev_class;
md->dev.parent = &mport->dev; md->dev.parent = &mport->dev;
md->dev.release = mport_device_release; md->dev.release = mport_device_release;
dev_set_name(&md->dev, DEV_NAME "%d", mport->id); dev_set_name(&md->dev, DEV_NAME "%d", mport->id);
@ -2600,10 +2602,10 @@ static int __init mport_init(void)
int ret; int ret;
/* Create device class needed by udev */ /* Create device class needed by udev */
dev_class = class_create(DRV_NAME); ret = class_register(&dev_class);
if (IS_ERR(dev_class)) { if (ret) {
rmcd_error("Unable to create " DRV_NAME " class"); rmcd_error("Unable to create " DRV_NAME " class");
return PTR_ERR(dev_class); return ret;
} }
ret = alloc_chrdev_region(&dev_number, 0, RIO_MAX_MPORTS, DRV_NAME); ret = alloc_chrdev_region(&dev_number, 0, RIO_MAX_MPORTS, DRV_NAME);
@ -2624,7 +2626,7 @@ static int __init mport_init(void)
err_cli: err_cli:
unregister_chrdev_region(dev_number, RIO_MAX_MPORTS); unregister_chrdev_region(dev_number, RIO_MAX_MPORTS);
err_chr: err_chr:
class_destroy(dev_class); class_unregister(&dev_class);
return ret; return ret;
} }
@ -2634,7 +2636,7 @@ err_chr:
static void __exit mport_exit(void) static void __exit mport_exit(void)
{ {
class_interface_unregister(&rio_mport_interface); class_interface_unregister(&rio_mport_interface);
class_destroy(dev_class); class_unregister(&dev_class);
unregister_chrdev_region(dev_number, RIO_MAX_MPORTS); unregister_chrdev_region(dev_number, RIO_MAX_MPORTS);
} }

18
drivers/rapidio/rio_cm.c
View File

@ -233,7 +233,9 @@ static DEFINE_IDR(ch_idr);
static LIST_HEAD(cm_dev_list); static LIST_HEAD(cm_dev_list);
static DECLARE_RWSEM(rdev_sem); static DECLARE_RWSEM(rdev_sem);
static struct class *dev_class; static const struct class dev_class = {
.name = DRV_NAME,
};
static unsigned int dev_major; static unsigned int dev_major;
static unsigned int dev_minor_base; static unsigned int dev_minor_base;
static dev_t dev_number; static dev_t dev_number;
@ -2072,7 +2074,7 @@ static int riocm_cdev_add(dev_t devno)
return ret; return ret;
} }
riocm_cdev.dev = device_create(dev_class, NULL, devno, NULL, DEV_NAME); riocm_cdev.dev = device_create(&dev_class, NULL, devno, NULL, DEV_NAME);
if (IS_ERR(riocm_cdev.dev)) { if (IS_ERR(riocm_cdev.dev)) {
cdev_del(&riocm_cdev.cdev); cdev_del(&riocm_cdev.cdev);
return PTR_ERR(riocm_cdev.dev); return PTR_ERR(riocm_cdev.dev);
@ -2293,15 +2295,15 @@ static int __init riocm_init(void)
int ret; int ret;
/* Create device class needed by udev */ /* Create device class needed by udev */
dev_class = class_create(DRV_NAME); ret = class_register(&dev_class);
if (IS_ERR(dev_class)) { if (ret) {
riocm_error("Cannot create " DRV_NAME " class"); riocm_error("Cannot create " DRV_NAME " class");
return PTR_ERR(dev_class); return ret;
} }
ret = alloc_chrdev_region(&dev_number, 0, 1, DRV_NAME); ret = alloc_chrdev_region(&dev_number, 0, 1, DRV_NAME);
if (ret) { if (ret) {
class_destroy(dev_class); class_unregister(&dev_class);
return ret; return ret;
} }
@ -2349,7 +2351,7 @@ err_cl:
class_interface_unregister(&rio_mport_interface); class_interface_unregister(&rio_mport_interface);
err_reg: err_reg:
unregister_chrdev_region(dev_number, 1); unregister_chrdev_region(dev_number, 1);
class_destroy(dev_class); class_unregister(&dev_class);
return ret; return ret;
} }
@ -2364,7 +2366,7 @@ static void __exit riocm_exit(void)
device_unregister(riocm_cdev.dev); device_unregister(riocm_cdev.dev);
cdev_del(&(riocm_cdev.cdev)); cdev_del(&(riocm_cdev.cdev));
class_destroy(dev_class); class_unregister(&dev_class);
unregister_chrdev_region(dev_number, 1); unregister_chrdev_region(dev_number, 1);
} }