dm: pci: Add a dm_ prefix to pci_get_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_get_bdf() accordingly.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

diff --git a/drivers/net/designware.c b/drivers/net/designware.c
index 04114a12447161356364cf1c1f7021884b64e953..0fccbc0040a9c8a88a81e7c79c268d92f3ed5a08 100644 (file)
--- a/drivers/net/designware.c
+++ b/drivers/net/designware.c
@@ -584,7 +584,7 @@ static int designware_eth_probe(struct udevice *dev)
         * or via a PCI bridge, fill in platdata before we probe the hardware.
         */
        if (device_is_on_pci_bus(dev)) {
-               pci_dev_t bdf = pci_get_bdf(dev);
+               pci_dev_t bdf = dm_pci_get_bdf(dev);
 
                dm_pci_read_config32(dev, PCI_BASE_ADDRESS_0, &iobase);
                iobase &= PCI_BASE_ADDRESS_MEM_MASK;

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index 6124bf0ab38f0fdd1755f33f6c22d421ef915f54..027f2bfd11f7c273f9ebf3aec14872af68e8d218 100644 (file)
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -5628,8 +5628,8 @@ static int e1000_eth_probe(struct udevice *dev)
        int ret;
 
        hw->name = dev->name;
-       ret = e1000_init_one(hw, trailing_strtol(dev->name), pci_get_bdf(dev),
-                            plat->enetaddr);
+       ret = e1000_init_one(hw, trailing_strtol(dev->name),
+                            dm_pci_get_bdf(dev), plat->enetaddr);
        if (ret < 0) {
                printf(pr_fmt("failed to initialize card: %d\n"), ret);
                return ret;

diff --git a/drivers/net/pch_gbe.c b/drivers/net/pch_gbe.c
index dfc01000fc4ca380ea413fcf9373c397acd68760..1b4dd56d52b3e5895b6f5c0787f9fa204bc5f40f 100644 (file)
--- a/drivers/net/pch_gbe.c
+++ b/drivers/net/pch_gbe.c
@@ -424,7 +424,7 @@ int pch_gbe_probe(struct udevice *dev)
        pci_dev_t devno;
        u32 iobase;
 
-       devno = pci_get_bdf(dev);
+       devno = dm_pci_get_bdf(dev);
 
        /*
         * The priv structure contains the descriptors and frame buffers which

diff --git a/drivers/net/rtl8169.c b/drivers/net/rtl8169.c
index 19422c4a2ace79892d942be0cab3345b76aa4f69..f210005dd0b6de231c1c8cc18ec64e59543d39a4 100644 (file)
--- a/drivers/net/rtl8169.c
+++ b/drivers/net/rtl8169.c
@@ -576,7 +576,7 @@ int rtl8169_eth_recv(struct udevice *dev, int flags, uchar **packetp)
 {
        struct rtl8169_private *priv = dev_get_priv(dev);
 
-       return rtl_recv_common(pci_get_bdf(dev), priv->iobase, packetp);
+       return rtl_recv_common(dm_pci_get_bdf(dev), priv->iobase, packetp);
 }
 #else
 static int rtl_recv(struct eth_device *dev)
@@ -661,7 +661,8 @@ int rtl8169_eth_send(struct udevice *dev, void *packet, int length)
 {
        struct rtl8169_private *priv = dev_get_priv(dev);
 
-       return rtl_send_common(pci_get_bdf(dev), priv->iobase, packet, length);
+       return rtl_send_common(dm_pci_get_bdf(dev), priv->iobase, packet,
+                              length);
 }
 
 #else
@@ -837,7 +838,7 @@ static int rtl8169_eth_start(struct udevice *dev)
 {
        struct eth_pdata *plat = dev_get_platdata(dev);
 
-       rtl8169_common_start(pci_get_bdf(dev), plat->enetaddr);
+       rtl8169_common_start(dm_pci_get_bdf(dev), plat->enetaddr);
 
        return 0;
 }
@@ -1130,10 +1131,10 @@ static int rtl8169_eth_probe(struct udevice *dev)
                region = 1;
                break;
        }
-       pci_read_config32(pci_get_bdf(dev), PCI_BASE_ADDRESS_0 + region * 4,
+       pci_read_config32(dm_pci_get_bdf(dev), PCI_BASE_ADDRESS_0 + region * 4,
                          &iobase);
        iobase &= ~0xf;
-       priv->iobase = (int)pci_mem_to_phys(pci_get_bdf(dev), iobase);
+       priv->iobase = (int)pci_mem_to_phys(dm_pci_get_bdf(dev), iobase);
 
        ret = rtl_init(priv->iobase, dev->name, plat->enetaddr);
        if (ret < 0) {

diff --git a/drivers/pci/pci-uclass.c b/drivers/pci/pci-uclass.c
index 5fe30723c243e0d7c8664c26c90cf8b5debce21e..f6ca58bb7dccaf2f25053939678ee6a0944bbd95 100644 (file)
--- a/drivers/pci/pci-uclass.c
+++ b/drivers/pci/pci-uclass.c
@@ -61,7 +61,7 @@ struct udevice *pci_get_controller(struct udevice *dev)
        return dev;
 }
 
-pci_dev_t pci_get_bdf(struct udevice *dev)
+pci_dev_t dm_pci_get_bdf(struct udevice *dev)
 {
        struct pci_child_platdata *pplat = dev_get_parent_platdata(dev);
        struct udevice *bus = dev->parent;
@@ -225,7 +225,8 @@ int dm_pci_write_config(struct udevice *dev, int offset, unsigned long value,
 
        for (bus = dev; device_is_on_pci_bus(bus);)
                bus = bus->parent;
-       return pci_bus_write_config(bus, pci_get_bdf(dev), offset, value, size);
+       return pci_bus_write_config(bus, dm_pci_get_bdf(dev), offset, value,
+                                   size);
 }
 
 
@@ -290,7 +291,7 @@ int dm_pci_read_config(struct udevice *dev, int offset, unsigned long *valuep,
 
        for (bus = dev; device_is_on_pci_bus(bus);)
                bus = bus->parent;
-       return pci_bus_read_config(bus, pci_get_bdf(dev), offset, valuep,
+       return pci_bus_read_config(bus, dm_pci_get_bdf(dev), offset, valuep,
                                   size);
 }
 
@@ -403,7 +404,7 @@ int pci_auto_config_devices(struct udevice *bus)
                int ret;
 
                debug("%s: device %s\n", __func__, dev->name);
-               ret = pciauto_config_device(hose, pci_get_bdf(dev));
+               ret = pciauto_config_device(hose, dm_pci_get_bdf(dev));
                if (ret < 0)
                        return ret;
                max_bus = ret;

diff --git a/drivers/pci/pci_compat.c b/drivers/pci/pci_compat.c
index 712c48f28f46220c2e7088282e5a53b2e756d7f9..dd15eb19f85a3f13d8847e883872ffabbba52830 100644 (file)
--- a/drivers/pci/pci_compat.c
+++ b/drivers/pci/pci_compat.c
@@ -34,5 +34,5 @@ pci_dev_t pci_find_devices(struct pci_device_id *ids, int index)
 
        if (pci_find_device_id(ids, index, &dev))
                return -1;
-       return pci_get_bdf(dev);
+       return dm_pci_get_bdf(dev);
 }

diff --git a/drivers/usb/host/ehci-pci.c b/drivers/usb/host/ehci-pci.c
index 0cb9fcc166dcc59f428cd4333ed58e06878b687d..d607088fdb9471ad78e11b8edc1adc33f4f14ba5 100644 (file)
--- a/drivers/usb/host/ehci-pci.c
+++ b/drivers/usb/host/ehci-pci.c
@@ -94,7 +94,7 @@ static int ehci_pci_probe(struct udevice *dev)
        struct ehci_hccr *hccr;
        struct ehci_hcor *hcor;
 
-       ehci_pci_common_init(pci_get_bdf(dev), &hccr, &hcor);
+       ehci_pci_common_init(dm_pci_get_bdf(dev), &hccr, &hcor);
 
        return ehci_register(dev, hccr, hcor, NULL, 0, USB_INIT_HOST);
 }

diff --git a/include/pci.h b/include/pci.h
index 2adca850b4f9dec777b3c9239afea4dd357fde58..5d45cdc0936b3fc1990a4269151c6b1659bd3e7c 100644 (file)
--- a/include/pci.h
+++ b/include/pci.h
@@ -862,12 +862,12 @@ struct dm_pci_ops {
 #define pci_get_ops(dev)       ((struct dm_pci_ops *)(dev)->driver->ops)
 
 /**
- * pci_get_bdf() - Get the BDF value for a device
+ * dm_pci_get_bdf() - Get the BDF value for a device
  *
  * @dev:       Device to check
  * @return bus/device/function value (see PCI_BDF())
  */
-pci_dev_t pci_get_bdf(struct udevice *dev);
+pci_dev_t dm_pci_get_bdf(struct udevice *dev);
 
 /**
  * pci_bind_bus_devices() - scan a PCI bus and bind devices