driver core: Add fwnode_init()

There are multiple locations in the kernel where a struct fwnode_handle
is initialized. Add fwnode_init() so that we have one way of
initializing a fwnode_handle.

Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Saravana Kannan <saravanak@google.com>
Link: https://lore.kernel.org/r/20201121020232.908850-8-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c
index d04de10..24e87b6 100644 (file)
--- a/drivers/acpi/property.c
+++ b/drivers/acpi/property.c
@@ -76,7 +76,7 @@ static bool acpi_nondev_subnode_extract(const union acpi_object *desc,
                return false;
 
        dn->name = link->package.elements[0].string.pointer;
-       dn->fwnode.ops = &acpi_data_fwnode_ops;
+       fwnode_init(&dn->fwnode, &acpi_data_fwnode_ops);
        dn->parent = parent;
        INIT_LIST_HEAD(&dn->data.properties);
        INIT_LIST_HEAD(&dn->data.subnodes);

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index a896e5e..0ac19f9 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -1589,7 +1589,7 @@ void acpi_init_device_object(struct acpi_device *device, acpi_handle handle,
        device->device_type = type;
        device->handle = handle;
        device->parent = acpi_bus_get_parent(handle);
-       device->fwnode.ops = &acpi_device_fwnode_ops;
+       fwnode_init(&device->fwnode, &acpi_device_fwnode_ops);
        acpi_set_device_status(device, sta);
        acpi_device_get_busid(device);
        acpi_set_pnp_ids(handle, &device->pnp, type);

diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c
index 010828f..4a4b200 100644 (file)
--- a/drivers/base/swnode.c
+++ b/drivers/base/swnode.c
@@ -653,7 +653,7 @@ swnode_register(const struct software_node *node, struct swnode *parent,
        swnode->parent = parent;
        swnode->allocated = allocated;
        swnode->kobj.kset = swnode_kset;
-       swnode->fwnode.ops = &software_node_ops;
+       fwnode_init(&swnode->fwnode, &software_node_ops);
 
        ida_init(&swnode->child_ids);
        INIT_LIST_HEAD(&swnode->entry);

diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-init.c
index f55a92f..b148f14 100644 (file)
--- a/drivers/firmware/efi/efi-init.c
+++ b/drivers/firmware/efi/efi-init.c
@@ -359,9 +359,7 @@ static const struct fwnode_operations efifb_fwnode_ops = {
        .add_links = efifb_add_links,
 };
 
-static struct fwnode_handle efifb_fwnode = {
-       .ops = &efifb_fwnode_ops,
-};
+static struct fwnode_handle efifb_fwnode;
 
 static int __init register_gop_device(void)
 {
@@ -375,8 +373,10 @@ static int __init register_gop_device(void)
        if (!pd)
                return -ENOMEM;
 
-       if (IS_ENABLED(CONFIG_PCI))
+       if (IS_ENABLED(CONFIG_PCI)) {
+               fwnode_init(&efifb_fwnode, &efifb_fwnode_ops);
                pd->dev.fwnode = &efifb_fwnode;
+       }
 
        err = platform_device_add_data(pd, &screen_info, sizeof(screen_info));
        if (err)

diff --git a/include/linux/fwnode.h b/include/linux/fwnode.h
index e0abafb..5589799 100644 (file)
--- a/include/linux/fwnode.h
+++ b/include/linux/fwnode.h
@@ -170,6 +170,12 @@ struct fwnode_operations {
        } while (false)
 #define get_dev_from_fwnode(fwnode)    get_device((fwnode)->dev)
 
+static inline void fwnode_init(struct fwnode_handle *fwnode,
+                              const struct fwnode_operations *ops)
+{
+       fwnode->ops = ops;
+}
+
 extern u32 fw_devlink_get_flags(void);
 
 #endif

diff --git a/include/linux/of.h b/include/linux/of.h
index af655d2..df71a3a 100644 (file)
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -108,7 +108,7 @@ static inline void of_node_init(struct device_node *node)
 #if defined(CONFIG_OF_KOBJ)
        kobject_init(&node->kobj, &of_node_ktype);
 #endif
-       node->fwnode.ops = &of_fwnode_ops;
+       fwnode_init(&node->fwnode, &of_fwnode_ops);
 }
 
 #if defined(CONFIG_OF_KOBJ)

diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c
index cf8b374..06fce7e 100644 (file)
--- a/kernel/irq/irqdomain.c
+++ b/kernel/irq/irqdomain.c
@@ -91,7 +91,7 @@ struct fwnode_handle *__irq_domain_alloc_fwnode(unsigned int type, int id,
        fwid->type = type;
        fwid->name = n;
        fwid->pa = pa;
-       fwid->fwnode.ops = &irqchip_fwnode_ops;
+       fwnode_init(&fwid->fwnode, &irqchip_fwnode_ops);
        return &fwid->fwnode;
 }
 EXPORT_SYMBOL_GPL(__irq_domain_alloc_fwnode);