driver core: Redefine the meaning of fwnode_operations.add_links()

[linux-2.6-microblaze.git] / drivers / firmware / efi / efi-init.c

diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-init.c
index f55a92f..65bb97c 100644 (file)
--- a/drivers/firmware/efi/efi-init.c
+++ b/drivers/firmware/efi/efi-init.c
@@ -316,7 +316,7 @@ static struct device_node *find_pci_overlap_node(void)
  * resource reservation conflict on the memory window that the efifb
  * framebuffer steals from the PCIe host bridge.
  */
-static int efifb_add_links(const struct fwnode_handle *fwnode,
+static int efifb_add_links(struct fwnode_handle *fwnode,
                           struct device *dev)
 {
        struct device_node *sup_np;
@@ -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)