crypto: qat: make adf_ctl_class constant
Subsystems (2)
PATCH 1/1 crypto: qat: make adf_ctl_class constant
Now that the driver core allows for struct class to be in read-only memory, we should make all 'class' structures declared at build time placing them into read-only memory, instead of having to be dynamically allocated at runtime.
--- .../crypto/intel/qat/qat_common/adf_ctl_drv.c | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c +12 -9
@@ -31,19 +31,22 @@ static const struct file_operations adf_ctl_ops = { .compat_ioctl = compat_ptr_ioctl, }; +static const struct class adf_ctl_class = { + .name =DEVICE_NAME , +}; +struct adf_ctl_drv_info {unsigned int major;struct cdev drv_cdev; -struct class *drv_class; };static struct adf_ctl_drv_info adf_ctl_drv;static void adf_chr_drv_destroy (void ) { -device_destroy (adf_ctl_drv.drv_class,MKDEV (adf_ctl_drv.major,0 )); +device_destroy (&adf_ctl_class,MKDEV (adf_ctl_drv.major,0 ));cdev_del (&adf_ctl_drv.drv_cdev); -class_destroy (adf_ctl_drv.drv_class); +class_unregister (&adf_ctl_class);unregister_chrdev_region (MKDEV (adf_ctl_drv.major,0 ),1 ); }
@@ -51,17 +54,17 @@ static int adf_chr_drv_create(void) {dev_t dev_id;struct device *drv_device; +int ret;if (alloc_chrdev_region (&dev_id,0 ,1 ,DEVICE_NAME )) {pr_err ("QAT: unable to allocate chrdev region\n" );return -EFAULT ; } - adf_ctl_drv.drv_class =class_create (DEVICE_NAME ); -if (IS_ERR (adf_ctl_drv.drv_class)) { -pr_err ("QAT: class_create failed for adf_ctl\n" ); + ret =class_register (&adf_ctl_class); +if (ret) goto err_chrdev_unreg; - } + adf_ctl_drv.major =MAJOR (dev_id);cdev_init (&adf_ctl_drv.drv_cdev, &adf_ctl_ops);if (cdev_add (&adf_ctl_drv.drv_cdev, dev_id,1 )) {
@@ -69,7 +72,7 @@ static int adf_chr_drv_create(void) goto err_class_destr; } - drv_device =device_create (adf_ctl_drv.drv_class,NULL , + drv_device =device_create (&adf_ctl_class,NULL ,MKDEV (adf_ctl_drv.major,0 ),NULL ,DEVICE_NAME );if (IS_ERR (drv_device)) {
@@ -80,7 +83,7 @@ static int adf_chr_drv_create(void) err_cdev_del:cdev_del (&adf_ctl_drv.drv_cdev); err_class_destr: -class_destroy (adf_ctl_drv.drv_class); +class_unregister (&adf_ctl_class); err_chrdev_unreg:unregister_chrdev_region (dev_id,1 );return -EFAULT ;
Signature · 1 line
2.45.2
Quoted 5 lines · Greg Kroah-Hartman
Now that the driver core allows for struct class to be in read-only memory, we should make all 'class' structures declared at build time placing them into read-only memory, instead of having to be dynamically allocated at runtime.
Quoted 10 lines
Cc Giovanni Cabiddu <[email protected]>Cc Herbert Xu <[email protected]>Cc "David S. Miller" <[email protected]>Cc Adam Guerin <[email protected]>Cc Benjamin Tissoires <[email protected]>Cc Tom Zanussi <[email protected]>Cc Shashank Gupta <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Herbert Xu
maintainerQuoted 15 lines · Greg Kroah-Hartman
Now that the driver core allows for struct class to be in read-only memory, we should make all 'class' structures declared at build time placing them into read-only memory, instead of having to be dynamically allocated at runtime.
Cc Giovanni Cabiddu <[email protected]>Cc Herbert Xu <[email protected]>Cc "David S. Miller" <[email protected]>Cc Adam Guerin <[email protected]>Cc Benjamin Tissoires <[email protected]>Cc Tom Zanussi <[email protected]>Cc Shashank Gupta <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 3 lines
--- .../crypto/intel/qat/qat_common/adf_ctl_drv.c | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-)
Patch applied. Thanks.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt