software nodes: Split software_node_notify()

Split software_node_notify_remove) out of software_node_notify()
and make device_platform_notify() call the latter on device addition
and the former on device removal.

While at it, put the headers of the above functions into base.h,
because they don't need to be present in a global header file.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/base/base.h b/drivers/base/base.h
index 404db83..2882af2 100644 (file)
--- a/drivers/base/base.h
+++ b/drivers/base/base.h
@@ -202,3 +202,6 @@ int devtmpfs_delete_node(struct device *dev);
 static inline int devtmpfs_create_node(struct device *dev) { return 0; }
 static inline int devtmpfs_delete_node(struct device *dev) { return 0; }
 #endif
+
+void software_node_notify(struct device *dev);
+void software_node_notify_remove(struct device *dev);

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 1521915..6cf9c50 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2003,16 +2003,15 @@ static inline int device_is_not_partition(struct device *dev)
 static int
 device_platform_notify(struct device *dev, enum kobject_action action)
 {
-       int ret;
-
        if (action == KOBJ_ADD)
                acpi_device_notify(dev);
        else if (action == KOBJ_REMOVE)
                acpi_device_notify_remove(dev);
 
-       ret = software_node_notify(dev, action);
-       if (ret)
-               return ret;
+       if (action == KOBJ_ADD)
+               software_node_notify(dev);
+       else if (action == KOBJ_REMOVE)
+               software_node_notify_remove(dev);
 
        if (platform_notify && action == KOBJ_ADD)
                platform_notify(dev);

diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index d1f1a82..7bd0f3c 100644 (file)
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -11,6 +11,8 @@
 #include <linux/property.h>
 #include <linux/slab.h>
 
+#include "base.h"
+
 struct swnode {
        struct kobject kobj;
        struct fwnode_handle fwnode;
@@ -1053,7 +1055,7 @@ int device_add_software_node(struct device *dev, const struct software_node *nod
         * balance.
         */
        if (device_is_registered(dev))
-               software_node_notify(dev, KOBJ_ADD);
+               software_node_notify(dev);
 
        return 0;
 }
@@ -1074,7 +1076,8 @@ void device_remove_software_node(struct device *dev)
                return;
 
        if (device_is_registered(dev))
-               software_node_notify(dev, KOBJ_REMOVE);
+               software_node_notify_remove(dev);
+
        set_secondary_fwnode(dev, NULL);
        kobject_put(&swnode->kobj);
 }
@@ -1117,44 +1120,44 @@ int device_create_managed_software_node(struct device *dev,
 }
 EXPORT_SYMBOL_GPL(device_create_managed_software_node);
 
-int software_node_notify(struct device *dev, unsigned long action)
+void software_node_notify(struct device *dev)
 {
        struct swnode *swnode;
        int ret;
 
        swnode = dev_to_swnode(dev);
        if (!swnode)
-               return 0;
+               return;
 
-       switch (action) {
-       case KOBJ_ADD:
-               ret = sysfs_create_link(&dev->kobj, &swnode->kobj, "software_node");
-               if (ret)
-                       break;
+       ret = sysfs_create_link(&dev->kobj, &swnode->kobj, "software_node");
+       if (ret)
+               return;
 
-               ret = sysfs_create_link(&swnode->kobj, &dev->kobj,
-                                       dev_name(dev));
-               if (ret) {
-                       sysfs_remove_link(&dev->kobj, "software_node");
-                       break;
-               }
-               kobject_get(&swnode->kobj);
-               break;
-       case KOBJ_REMOVE:
-               sysfs_remove_link(&swnode->kobj, dev_name(dev));
+       ret = sysfs_create_link(&swnode->kobj, &dev->kobj, dev_name(dev));
+       if (ret) {
                sysfs_remove_link(&dev->kobj, "software_node");
-               kobject_put(&swnode->kobj);
-
-               if (swnode->managed) {
-                       set_secondary_fwnode(dev, NULL);
-                       kobject_put(&swnode->kobj);
-               }
-               break;
-       default:
-               break;
+               return;
        }
 
-       return 0;
+       kobject_get(&swnode->kobj);
+}
+
+void software_node_notify_remove(struct device *dev)
+{
+       struct swnode *swnode;
+
+       swnode = dev_to_swnode(dev);
+       if (!swnode)
+               return;
+
+       sysfs_remove_link(&swnode->kobj, dev_name(dev));
+       sysfs_remove_link(&dev->kobj, "software_node");
+       kobject_put(&swnode->kobj);
+
+       if (swnode->managed) {
+               set_secondary_fwnode(dev, NULL);
+               kobject_put(&swnode->kobj);
+       }
 }
 
 static int __init software_node_init(void)

diff --git a/include/linux/property.h b/include/linux/property.h
index 073e680..357513a 100644 (file)
--- a/include/linux/property.h
+++ b/include/linux/property.h
@@ -484,8 +484,6 @@ void software_node_unregister_node_group(const struct software_node **node_group
 int software_node_register(const struct software_node *node);
 void software_node_unregister(const struct software_node *node);
 
-int software_node_notify(struct device *dev, unsigned long action);
-
 struct fwnode_handle *
 fwnode_create_software_node(const struct property_entry *properties,
                            const struct fwnode_handle *parent);