Remove unnecessary instances of DECLARE_GLOBAL_DATA_PTR

[u-boot] / drivers / phy / phy-uclass.c

diff --git a/drivers/phy/phy-uclass.c b/drivers/phy/phy-uclass.c
index 0d8bef76dbdab7c3504ead2dd301b05b1dc89db5..bdca4c0238ac037764e4228361a97b23ac1317f4 100644 (file)
--- a/drivers/phy/phy-uclass.c
+++ b/drivers/phy/phy-uclass.c
@@ -9,15 +9,13 @@
 #include <dm.h>
 #include <generic-phy.h>
 
-DECLARE_GLOBAL_DATA_PTR;
-
 static inline struct phy_ops *phy_dev_ops(struct udevice *dev)
 {
        return (struct phy_ops *)dev->driver->ops;
 }
 
 static int generic_phy_xlate_offs_flags(struct phy *phy,
-                                struct fdtdec_phandle_args *args)
+                                       struct ofnode_phandle_args *args)
 {
        debug("%s(phy=%p)\n", __func__, phy);
 
@@ -31,14 +29,13 @@ static int generic_phy_xlate_offs_flags(struct phy *phy,
        else
                phy->id = 0;
 
-
        return 0;
 }
 
 int generic_phy_get_by_index(struct udevice *dev, int index,
                             struct phy *phy)
 {
-       struct fdtdec_phandle_args args;
+       struct ofnode_phandle_args args;
        struct phy_ops *ops;
        int ret;
        struct udevice *phydev;
@@ -46,18 +43,18 @@ int generic_phy_get_by_index(struct udevice *dev, int index,
        debug("%s(dev=%p, index=%d, phy=%p)\n", __func__, dev, index, phy);
 
        assert(phy);
-       ret = fdtdec_parse_phandle_with_args(gd->fdt_blob, dev_of_offset(dev),
-                                            "phys", "#phy-cells", 0, index,
-                                            &args);
+       phy->dev = NULL;
+       ret = dev_read_phandle_with_args(dev, "phys", "#phy-cells", 0, index,
+                                        &args);
        if (ret) {
-               debug("%s: fdtdec_parse_phandle_with_args failed: err=%d\n",
+               debug("%s: dev_read_phandle_with_args failed: err=%d\n",
                      __func__, ret);
                return ret;
        }
 
-       ret = uclass_get_device_by_of_offset(UCLASS_PHY, args.node, &phydev);
+       ret = uclass_get_device_by_ofnode(UCLASS_PHY, args.node, &phydev);
        if (ret) {
-               debug("%s: uclass_get_device_by_of_offset failed: err=%d\n",
+               debug("%s: uclass_get_device_by_ofnode failed: err=%d\n",
                      __func__, ret);
                return ret;
        }
@@ -88,10 +85,9 @@ int generic_phy_get_by_name(struct udevice *dev, const char *phy_name,
 
        debug("%s(dev=%p, name=%s, phy=%p)\n", __func__, dev, phy_name, phy);
 
-       index = fdt_stringlist_search(gd->fdt_blob, dev_of_offset(dev),
-                                     "phy-names", phy_name);
+       index = dev_read_stringlist_search(dev, "phy-names", phy_name);
        if (index < 0) {
-               debug("fdt_stringlist_search() failed: %d\n", index);
+               debug("dev_read_stringlist_search() failed: %d\n", index);
                return index;
        }