phy: core: make phy_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 phy_class structure to be declared at build time
placing it into read-only memory, instead of having to be dynamically
allocated at boot time.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Suggested-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: "Ricardo B. Marliere" <ricardo@marliere.net>
Link: https://lore.kernel.org/r/20240305-class_cleanup-phy-v1-1-106013a644dc@marliere.net
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index c5c8d70bc8533e6d1f863a2e696ecb91bf0b2fba..bf6a07590321c5ca045982cbbee42ce12afe8308 100644 (file)
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -20,7 +20,12 @@
 #include <linux/pm_runtime.h>
 #include <linux/regulator/consumer.h>
 
-static struct class *phy_class;
+static void phy_release(struct device *dev);
+static const struct class phy_class = {
+       .name = "phy",
+       .dev_release = phy_release,
+};
+
 static struct dentry *phy_debugfs_root;
 static DEFINE_MUTEX(phy_provider_mutex);
 static LIST_HEAD(phy_provider_list);
@@ -753,7 +758,7 @@ struct phy *of_phy_simple_xlate(struct device *dev,
        struct phy *phy;
        struct class_dev_iter iter;
 
-       class_dev_iter_init(&iter, phy_class, NULL, NULL);
+       class_dev_iter_init(&iter, &phy_class, NULL, NULL);
        while ((dev = class_dev_iter_next(&iter))) {
                phy = to_phy(dev);
                if (args->np != phy->dev.of_node)
@@ -1016,7 +1021,7 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
        device_initialize(&phy->dev);
        mutex_init(&phy->mutex);
 
-       phy->dev.class = phy_class;
+       phy->dev.class = &phy_class;
        phy->dev.parent = dev;
        phy->dev.of_node = node ?: dev->of_node;
        phy->id = id;
@@ -1285,14 +1290,13 @@ static void phy_release(struct device *dev)
 
 static int __init phy_core_init(void)
 {
-       phy_class = class_create("phy");
-       if (IS_ERR(phy_class)) {
-               pr_err("failed to create phy class --> %ld\n",
-                       PTR_ERR(phy_class));
-               return PTR_ERR(phy_class);
-       }
+       int err;
 
-       phy_class->dev_release = phy_release;
+       err = class_register(&phy_class);
+       if (err) {
+               pr_err("failed to register phy class");
+               return err;
+       }
 
        phy_debugfs_root = debugfs_create_dir("phy", NULL);
 
@@ -1303,6 +1307,6 @@ device_initcall(phy_core_init);
 static void __exit phy_core_exit(void)
 {
        debugfs_remove_recursive(phy_debugfs_root);
-       class_destroy(phy_class);
+       class_unregister(&phy_class);
 }
 module_exit(phy_core_exit);