From: Jori Koolstra <jkoolstra@xs4all.nl>
Date: Mon, 2 Mar 2026 15:11:32 +0000 (+0100)
Subject: pps: change pps_class to a const struct
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c230ae1f9480cf9d363ded8179b14b49c5d3dd69;p=thirdparty%2Fkernel%2Flinux.git

pps: change pps_class to a const struct

The class_create() call has been deprecated in favor of class_register()
as the driver core now allows for a struct class to be in read-only
memory. Change pps_class to be a const struct class and drop the
class_create() call.

Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Jori Koolstra <jkoolstra@xs4all.nl>
Acked-by: Rodolfo Giometti <giometti@enneenne.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://patch.msgid.link/20260302151132.3302993-1-jkoolstra@xs4all.nl
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c
index c6b8b6478276..de1122bb69ea 100644
--- a/drivers/pps/pps.c
+++ b/drivers/pps/pps.c
@@ -26,7 +26,10 @@
  */
 
 static int pps_major;
-static struct class *pps_class;
+static const struct class pps_class = {
+	.name		= "pps",
+	.dev_groups	= pps_groups
+};
 
 static DEFINE_MUTEX(pps_idr_lock);
 static DEFINE_IDR(pps_idr);
@@ -379,7 +382,7 @@ int pps_register_cdev(struct pps_device *pps)
 	}
 	pps->id = err;
 
-	pps->dev.class = pps_class;
+	pps->dev.class = &pps_class;
 	pps->dev.parent = pps->info.dev;
 	pps->dev.devt = MKDEV(pps_major, pps->id);
 	dev_set_drvdata(&pps->dev, pps);
@@ -408,7 +411,7 @@ void pps_unregister_cdev(struct pps_device *pps)
 {
 	pr_debug("unregistering pps%d\n", pps->id);
 	pps->lookup_cookie = NULL;
-	device_destroy(pps_class, pps->dev.devt);
+	device_destroy(&pps_class, pps->dev.devt);
 
 	/* Now we can release the ID for re-use */
 	mutex_lock(&pps_idr_lock);
@@ -460,18 +463,19 @@ EXPORT_SYMBOL(pps_lookup_dev);
 
 static void __exit pps_exit(void)
 {
-	class_destroy(pps_class);
+	class_unregister(&pps_class);
 	__unregister_chrdev(pps_major, 0, PPS_MAX_SOURCES, "pps");
 }
 
 static int __init pps_init(void)
 {
-	pps_class = class_create("pps");
-	if (IS_ERR(pps_class)) {
-		pr_err("failed to allocate class\n");
-		return PTR_ERR(pps_class);
+	int err;
+
+	err = class_register(&pps_class);
+	if (err) {
+		pr_err("failed to register class\n");
+		return err;
 	}
-	pps_class->dev_groups = pps_groups;
 
 	pps_major = __register_chrdev(0, 0, PPS_MAX_SOURCES, "pps",
 				      &pps_cdev_fops);
@@ -487,7 +491,7 @@ static int __init pps_init(void)
 	return 0;
 
 remove_class:
-	class_destroy(pps_class);
+	class_unregister(&pps_class);
 	return pps_major;
 }