dm: core: Rename device_bind_ofnode() to device_bind()

This is the standard function to use when binding devices. Drop the
'_ofnode' suffix to make this clear.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/device.c b/drivers/core/device.c
index 081dd1f..c8a219d 100644 (file)
--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -240,9 +240,9 @@ int device_bind_offset(struct udevice *parent, const struct driver *drv,
                                  offset_to_ofnode(of_offset), 0, devp);
 }
 
-int device_bind_ofnode(struct udevice *parent, const struct driver *drv,
-                      const char *name, void *platdata, ofnode node,
-                      struct udevice **devp)
+int device_bind(struct udevice *parent, const struct driver *drv,
+               const char *name, void *platdata, ofnode node,
+               struct udevice **devp)
 {
        return device_bind_common(parent, drv, name, platdata, 0, node, 0,
                                  devp);

diff --git a/drivers/firmware/scmi/scmi_agent-uclass.c b/drivers/firmware/scmi/scmi_agent-uclass.c
index 7dc5331..b3d3f0a 100644 (file)
--- a/drivers/firmware/scmi/scmi_agent-uclass.c
+++ b/drivers/firmware/scmi/scmi_agent-uclass.c
@@ -89,8 +89,8 @@ static int scmi_bind_protocols(struct udevice *dev)
                        continue;
                }
 
-               ret = device_bind_ofnode(dev, drv, ofnode_get_name(node),
-                                        NULL, node, NULL);
+               ret = device_bind(dev, drv, ofnode_get_name(node), NULL, node,
+                                 NULL);
                if (ret)
                        break;
        }

diff --git a/drivers/gpio/dwapb_gpio.c b/drivers/gpio/dwapb_gpio.c
index 37916e7..cf20a50 100644 (file)
--- a/drivers/gpio/dwapb_gpio.c
+++ b/drivers/gpio/dwapb_gpio.c
@@ -202,8 +202,8 @@ static int gpio_dwapb_bind(struct udevice *dev)
                        }
                }
 
-               ret = device_bind_ofnode(dev, dev->driver, plat->name,
-                                        plat, node, &subdev);
+               ret = device_bind(dev, dev->driver, plat->name, plat, node,
+                                 &subdev);
                if (ret)
                        return ret;
 

diff --git a/drivers/misc/i2c_eeprom.c b/drivers/misc/i2c_eeprom.c
index 3651ba4..92e1835 100644 (file)
--- a/drivers/misc/i2c_eeprom.c
+++ b/drivers/misc/i2c_eeprom.c
@@ -131,8 +131,8 @@ static int i2c_eeprom_std_bind(struct udevice *dev)
                if (!name)
                        continue;
 
-               device_bind_ofnode(dev, DM_GET_DRIVER(i2c_eeprom_partition),
-                                  name, NULL, partition, NULL);
+               device_bind(dev, DM_GET_DRIVER(i2c_eeprom_partition), name,
+                           NULL, partition, NULL);
        }
 
        return 0;

diff --git a/drivers/mtd/spi/sandbox.c b/drivers/mtd/spi/sandbox.c
index 0b602dc..1d0c1cb 100644 (file)
--- a/drivers/mtd/spi/sandbox.c
+++ b/drivers/mtd/spi/sandbox.c
@@ -538,7 +538,7 @@ int sandbox_sf_bind_emul(struct sandbox_state *state, int busnum, int cs,
        str = strdup(name);
        if (!str)
                return -ENOMEM;
-       ret = device_bind_ofnode(bus, drv, str, NULL, node, &emul);
+       ret = device_bind(bus, drv, str, NULL, node, &emul);
        if (ret) {
                free(str);
                printf("Cannot create emul device for spec '%s' (err=%d)\n",

diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index eb07d25..9230cfe 100644 (file)
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -750,8 +750,8 @@ static int pci_find_and_bind_driver(struct udevice *parent,
                         * find another driver. For now this doesn't seem
                         * necesssary, so just bind the first match.
                         */
-                       ret = device_bind_ofnode(parent, drv, drv->name, NULL,
-                                                node, &dev);
+                       ret = device_bind(parent, drv, drv->name, NULL, node,
+                                         &dev);
                        if (ret)
                                goto error;
                        debug("%s: Match found: %s\n", __func__, drv->name);

diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index c9afe75..ba1c139 100644 (file)
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -501,8 +501,8 @@ static int mvebu_pcie_bind(struct udevice *parent)
                        return -ENOMEM;
 
                /* Create child device UCLASS_PCI and bind it */
-               device_bind_ofnode(parent, &pcie_mvebu_drv, pcie->name, pcie,
-                                  subnode, &dev);
+               device_bind(parent, &pcie_mvebu_drv, pcie->name, pcie, subnode,
+                           &dev);
        }
 
        return 0;

diff --git a/drivers/usb/host/usb-uclass.c b/drivers/usb/host/usb-uclass.c
index 8773824..2f8c903 100644 (file)
--- a/drivers/usb/host/usb-uclass.c
+++ b/drivers/usb/host/usb-uclass.c
@@ -581,8 +581,8 @@ static int usb_find_and_bind_driver(struct udevice *parent,
                         * find another driver. For now this doesn't seem
                         * necesssary, so just bind the first match.
                         */
-                       ret = device_bind_ofnode(parent, drv, drv->name, NULL,
-                                                node, &dev);
+                       ret = device_bind(parent, drv, drv->name, NULL, node,
+                                         &dev);
                        if (ret)
                                goto error;
                        debug("%s: Match found: %s\n", __func__, drv->name);

diff --git a/include/dm/device-internal.h b/include/dm/device-internal.h
index 59d3be0..636210f 100644 (file)
--- a/include/dm/device-internal.h
+++ b/include/dm/device-internal.h
@@ -40,9 +40,9 @@ int device_bind_offset(struct udevice *parent, const struct driver *drv,
                       const char *name, void *platdata, int of_offset,
                       struct udevice **devp);
 
-int device_bind_ofnode(struct udevice *parent, const struct driver *drv,
-                      const char *name, void *platdata, ofnode node,
-                      struct udevice **devp);
+int device_bind(struct udevice *parent, const struct driver *drv,
+               const char *name, void *platdata, ofnode node,
+               struct udevice **devp);
 
 /**
  * device_bind_with_driver_data() - Create a device and bind it to a driver

diff --git a/test/dm/core.c b/test/dm/core.c
index 6f380a5..ba9e60d 100644 (file)
--- a/test/dm/core.c
+++ b/test/dm/core.c
@@ -1052,8 +1052,8 @@ static int dm_test_inactive_child(struct unit_test_state *uts)
         */
        ut_asserteq(-ENODEV, device_find_first_inactive_child(parent,
                                                        UCLASS_TEST, &dev1));
-       ut_assertok(device_bind_ofnode(parent, DM_GET_DRIVER(test_drv),
-                                      "test_child", 0, ofnode_null(), &dev1));
+       ut_assertok(device_bind(parent, DM_GET_DRIVER(test_drv),
+                               "test_child", 0, ofnode_null(), &dev1));
 
        ut_assertok(device_find_first_inactive_child(parent, UCLASS_TEST,
                                                     &dev2));