Distinguish struct device type instances from dev_t instances to enhance readability. Signed-off-by: Shahar Avidar <ikobh7@xxxxxxxxx> --- drivers/staging/pi433/pi433_if.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/pi433/pi433_if.c b/drivers/staging/pi433/pi433_if.c index 208c0c6d3649..62ce75b07bf0 100644 --- a/drivers/staging/pi433/pi433_if.c +++ b/drivers/staging/pi433/pi433_if.c @@ -53,7 +53,7 @@ #define FIFO_THRESHOLD 15 /* bytes */ #define NUM_DIO 2 -static dev_t pi433_dev; +static dev_t pi433_devt; static DEFINE_IDR(pi433_idr); static DEFINE_MUTEX(minor_lock); /* Protect idr accesses */ static struct dentry *root_dir; /* debugfs root directory for the driver */ @@ -1262,7 +1262,7 @@ static int pi433_probe(struct spi_device *spi) } /* create device */ - pi433->devt = MKDEV(MAJOR(pi433_dev), pi433->minor); + pi433->devt = MKDEV(MAJOR(pi433_devt), pi433->minor); pi433->dev = device_create(&pi433_class, &spi->dev, pi433->devt, @@ -1276,7 +1276,7 @@ static int pi433_probe(struct spi_device *spi) } else { dev_dbg(pi433->dev, "created device for major %d, minor %d\n", - MAJOR(pi433_dev), + MAJOR(pi433_devt), pi433->minor); } @@ -1398,13 +1398,13 @@ static int __init pi433_init(void) * that will key udev/mdev to add/remove /dev nodes. * Last, register the driver which manages those device numbers. */ - status = alloc_chrdev_region(&pi433_dev, 0, N_PI433_MINORS, "pi433"); + status = alloc_chrdev_region(&pi433_devt, 0, N_PI433_MINORS, "pi433"); if (status < 0) return status; status = class_register(&pi433_class); if (status) { - unregister_chrdev(MAJOR(pi433_dev), + unregister_chrdev(MAJOR(pi433_devt), pi433_spi_driver.driver.name); return status; } @@ -1414,7 +1414,7 @@ static int __init pi433_init(void) status = spi_register_driver(&pi433_spi_driver); if (status < 0) { class_unregister(&pi433_class); - unregister_chrdev(MAJOR(pi433_dev), + unregister_chrdev(MAJOR(pi433_devt), pi433_spi_driver.driver.name); } @@ -1427,7 +1427,7 @@ static void __exit pi433_exit(void) { spi_unregister_driver(&pi433_spi_driver); class_unregister(&pi433_class); - unregister_chrdev(MAJOR(pi433_dev), pi433_spi_driver.driver.name); + unregister_chrdev(MAJOR(pi433_devt), pi433_spi_driver.driver.name); debugfs_remove(root_dir); } module_exit(pi433_exit); -- 2.34.1