dm: pci: Add a dm_ prefix to pci_bus_find_bdf()

Most driver model PCI functions have a dm_ prefix. At some point, when the
old code is converted to driver model and the old functions are removed, we
will drop that prefix.

For consistency, we should use the dm_ prefix for all driver model
functions. Update pci_bus_find_bdf() accordingly.

Signed-off-by: Simon Glass <[email protected]>
Reviewed-by: Bin Meng <[email protected]>

diff --git a/common/cmd_pci.c b/common/cmd_pci.c
index 4e0951f864b04ba1cb80f43835d48db3c1d830a5..8094d3380fbd30284ab0438dc21dbea128980872 100644 (file)
--- a/common/cmd_pci.c
+++ b/common/cmd_pci.c
@@ -606,7 +606,7 @@ static int do_pci(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
        }
 
 #ifdef CONFIG_DM_PCI
-       ret = pci_bus_find_bdf(bdf, &dev);
+       ret = dm_pci_bus_find_bdf(bdf, &dev);
        if (ret) {
                printf("No such device\n");
                return CMD_RET_FAILURE;

diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index f6ca58bb7dccaf2f25053939678ee6a0944bbd95..28280553dadd80f4fa02cb697bd69fb5f9e4d8df 100644 (file)
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -128,7 +128,7 @@ int pci_bus_find_devfn(struct udevice *bus, pci_dev_t find_devfn,
        return -ENODEV;
 }
 
-int pci_bus_find_bdf(pci_dev_t bdf, struct udevice **devp)
+int dm_pci_bus_find_bdf(pci_dev_t bdf, struct udevice **devp)
 {
        struct udevice *bus;
        int ret;

diff --git a/include/pci.h b/include/pci.h
index 5d45cdc0936b3fc1990a4269151c6b1659bd3e7c..586197610b9791e5ba73a18397ac15ffc667b95a 100644 (file)
--- a/include/pci.h
+++ b/include/pci.h
@@ -902,13 +902,13 @@ int pci_bind_bus_devices(struct udevice *bus);
 int pci_auto_config_devices(struct udevice *bus);
 
 /**
- * pci_bus_find_bdf() - Find a device given its PCI bus address
+ * dm_pci_bus_find_bdf() - Find a device given its PCI bus address
  *
  * @bdf:       PCI device address: bus, device and function -see PCI_BDF()
  * @devp:      Returns the device for this address, if found
  * @return 0 if OK, -ENODEV if not found
  */
-int pci_bus_find_bdf(pci_dev_t bdf, struct udevice **devp);
+int dm_pci_bus_find_bdf(pci_dev_t bdf, struct udevice **devp);
 
 /**
  * pci_bus_find_devfn() - Find a device on a bus