Commit f267da65 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

staging: pi433: make pi433_class constant

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.

Link: https://lore.kernel.org/r/2023100512-sweat-abruptly-2445@gregkhSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 0c99ee4e
...@@ -56,7 +56,10 @@ static DEFINE_IDR(pi433_idr); ...@@ -56,7 +56,10 @@ static DEFINE_IDR(pi433_idr);
static DEFINE_MUTEX(minor_lock); /* Protect idr accesses */ static DEFINE_MUTEX(minor_lock); /* Protect idr accesses */
static struct dentry *root_dir; /* debugfs root directory for the driver */ static struct dentry *root_dir; /* debugfs root directory for the driver */
static struct class *pi433_class; /* mainly for udev to create /dev/pi433 */ /* mainly for udev to create /dev/pi433 */
static const struct class pi433_class = {
.name = "pi433",
};
/* /*
* tx config is instance specific * tx config is instance specific
...@@ -1259,7 +1262,7 @@ static int pi433_probe(struct spi_device *spi) ...@@ -1259,7 +1262,7 @@ static int pi433_probe(struct spi_device *spi)
/* create device */ /* create device */
device->devt = MKDEV(MAJOR(pi433_dev), device->minor); device->devt = MKDEV(MAJOR(pi433_dev), device->minor);
device->dev = device_create(pi433_class, device->dev = device_create(&pi433_class,
&spi->dev, &spi->dev,
device->devt, device->devt,
device, device,
...@@ -1315,7 +1318,7 @@ static int pi433_probe(struct spi_device *spi) ...@@ -1315,7 +1318,7 @@ static int pi433_probe(struct spi_device *spi)
cdev_failed: cdev_failed:
kthread_stop(device->tx_task_struct); kthread_stop(device->tx_task_struct);
send_thread_failed: send_thread_failed:
device_destroy(pi433_class, device->devt); device_destroy(&pi433_class, device->devt);
device_create_failed: device_create_failed:
pi433_free_minor(device); pi433_free_minor(device);
minor_failed: minor_failed:
...@@ -1342,7 +1345,7 @@ static void pi433_remove(struct spi_device *spi) ...@@ -1342,7 +1345,7 @@ static void pi433_remove(struct spi_device *spi)
kthread_stop(device->tx_task_struct); kthread_stop(device->tx_task_struct);
device_destroy(pi433_class, device->devt); device_destroy(&pi433_class, device->devt);
cdev_del(device->cdev); cdev_del(device->cdev);
...@@ -1398,18 +1401,18 @@ static int __init pi433_init(void) ...@@ -1398,18 +1401,18 @@ static int __init pi433_init(void)
if (status < 0) if (status < 0)
return status; return status;
pi433_class = class_create("pi433"); status = class_register(&pi433_class);
if (IS_ERR(pi433_class)) { if (status) {
unregister_chrdev(MAJOR(pi433_dev), unregister_chrdev(MAJOR(pi433_dev),
pi433_spi_driver.driver.name); pi433_spi_driver.driver.name);
return PTR_ERR(pi433_class); return status;
} }
root_dir = debugfs_create_dir(KBUILD_MODNAME, NULL); root_dir = debugfs_create_dir(KBUILD_MODNAME, NULL);
status = spi_register_driver(&pi433_spi_driver); status = spi_register_driver(&pi433_spi_driver);
if (status < 0) { if (status < 0) {
class_destroy(pi433_class); class_unregister(&pi433_class);
unregister_chrdev(MAJOR(pi433_dev), unregister_chrdev(MAJOR(pi433_dev),
pi433_spi_driver.driver.name); pi433_spi_driver.driver.name);
} }
...@@ -1422,7 +1425,7 @@ module_init(pi433_init); ...@@ -1422,7 +1425,7 @@ module_init(pi433_init);
static void __exit pi433_exit(void) static void __exit pi433_exit(void)
{ {
spi_unregister_driver(&pi433_spi_driver); spi_unregister_driver(&pi433_spi_driver);
class_destroy(pi433_class); class_unregister(&pi433_class);
unregister_chrdev(MAJOR(pi433_dev), pi433_spi_driver.driver.name); unregister_chrdev(MAJOR(pi433_dev), pi433_spi_driver.driver.name);
debugfs_remove(root_dir); debugfs_remove(root_dir);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment