ptp: make ptp_class constant

Since commit 43a7206b0963 ("driver core: class: make class_register() take
a const *"), the driver core allows for struct class to be in read-only
memory, so move the ptp_class structure to be declared at build time
placing it into read-only memory, instead of having to be dynamically
allocated at boot time.

Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ricardo B. Marliere <ricardo@marliere.net>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://lore.kernel.org/r/20240305-ptp-v1-1-ed253eb33c20@marliere.net
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/ptp/ptp_clock.c b/drivers/ptp/ptp_clock.c
index 3aaf1a3430c50e81d39164e63d56a9ba4ef33690..4deec4a3e66c9801d6441ee9f6ae575e38ada050 100644 (file)
--- a/drivers/ptp/ptp_clock.c
+++ b/drivers/ptp/ptp_clock.c
@@ -25,7 +25,10 @@
 #define PTP_PPS_EVENT PPS_CAPTUREASSERT
 #define PTP_PPS_MODE (PTP_PPS_DEFAULTS | PPS_CANWAIT | PPS_TSFMT_TSPEC)
 
-struct class *ptp_class;
+const struct class ptp_class = {
+       .name = "ptp",
+       .dev_groups = ptp_groups
+};
 
 /* private globals */
 
@@ -335,7 +338,7 @@ struct ptp_clock *ptp_clock_register(struct ptp_clock_info *info,
        /* Initialize a new device of our class in our clock structure. */
        device_initialize(&ptp->dev);
        ptp->dev.devt = ptp->devid;
-       ptp->dev.class = ptp_class;
+       ptp->dev.class = &ptp_class;
        ptp->dev.parent = parent;
        ptp->dev.groups = ptp->pin_attr_groups;
        ptp->dev.release = ptp_clock_release;
@@ -509,7 +512,7 @@ EXPORT_SYMBOL(ptp_cancel_worker_sync);
 
 static void __exit ptp_exit(void)
 {
-       class_destroy(ptp_class);
+       class_unregister(&ptp_class);
        unregister_chrdev_region(ptp_devt, MINORMASK + 1);
        ida_destroy(&ptp_clocks_map);
 }
@@ -518,10 +521,10 @@ static int __init ptp_init(void)
 {
        int err;
 
-       ptp_class = class_create("ptp");
-       if (IS_ERR(ptp_class)) {
+       err = class_register(&ptp_class);
+       if (err) {
                pr_err("ptp: failed to allocate class\n");
-               return PTR_ERR(ptp_class);
+               return err;
        }
 
        err = alloc_chrdev_region(&ptp_devt, 0, MINORMASK + 1, "ptp");
@@ -530,12 +533,11 @@ static int __init ptp_init(void)
                goto no_region;
        }
 
-       ptp_class->dev_groups = ptp_groups;
        pr_info("PTP clock support registered\n");
        return 0;
 
 no_region:
-       class_destroy(ptp_class);
+       class_unregister(&ptp_class);
        return err;
 }
 

diff --git a/drivers/ptp/ptp_private.h b/drivers/ptp/ptp_private.h
index 45f9002a5dcaea2c588c001fa83317fc318500ee..18934e28469ee6e3bf9c9e6d1a1adb82808d88e6 100644 (file)
--- a/drivers/ptp/ptp_private.h
+++ b/drivers/ptp/ptp_private.h
@@ -120,7 +120,7 @@ static inline bool ptp_clock_freerun(struct ptp_clock *ptp)
        return ptp_vclock_in_use(ptp);
 }
 
-extern struct class *ptp_class;
+extern const struct class ptp_class;
 
 /*
  * see ptp_chardev.c

diff --git a/drivers/ptp/ptp_vclock.c b/drivers/ptp/ptp_vclock.c
index dcf752c9e0450651d3b7c68cac132edc90c9a732..7febfdcbde8bc6cdc70c6d7a3567bede87c66114 100644 (file)
--- a/drivers/ptp/ptp_vclock.c
+++ b/drivers/ptp/ptp_vclock.c
@@ -241,7 +241,7 @@ int ptp_get_vclocks_index(int pclock_index, int **vclock_index)
                return num;
 
        snprintf(name, PTP_CLOCK_NAME_LEN, "ptp%d", pclock_index);
-       dev = class_find_device_by_name(ptp_class, name);
+       dev = class_find_device_by_name(&ptp_class, name);
        if (!dev)
                return num;