Merge branch 'for-6.8/amd-sfh' into for-linus

[linux-2.6-microblaze.git] / drivers / phy / broadcom / phy-bcm-ns-usb3.c

diff --git a/drivers/phy/broadcom/phy-bcm-ns-usb3.c b/drivers/phy/broadcom/phy-bcm-ns-usb3.c
index 69584b6..2c8b1b7 100644 (file)
--- a/drivers/phy/broadcom/phy-bcm-ns-usb3.c
+++ b/drivers/phy/broadcom/phy-bcm-ns-usb3.c
@@ -16,10 +16,11 @@
 #include <linux/iopoll.h>
 #include <linux/mdio.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/of_address.h>
-#include <linux/of_platform.h>
 #include <linux/platform_device.h>
 #include <linux/phy/phy.h>
+#include <linux/property.h>
 #include <linux/slab.h>
 
 #define BCM_NS_USB3_PHY_BASE_ADDR_REG  0x1f
@@ -189,7 +190,6 @@ static int bcm_ns_usb3_mdio_phy_write(struct bcm_ns_usb3 *usb3, u16 reg,
 static int bcm_ns_usb3_mdio_probe(struct mdio_device *mdiodev)
 {
        struct device *dev = &mdiodev->dev;
-       const struct of_device_id *of_id;
        struct phy_provider *phy_provider;
        struct device_node *syscon_np;
        struct bcm_ns_usb3 *usb3;
@@ -203,10 +203,7 @@ static int bcm_ns_usb3_mdio_probe(struct mdio_device *mdiodev)
        usb3->dev = dev;
        usb3->mdiodev = mdiodev;
 
-       of_id = of_match_device(bcm_ns_usb3_id_table, dev);
-       if (!of_id)
-               return -EINVAL;
-       usb3->family = (uintptr_t)of_id->data;
+       usb3->family = (enum bcm_ns_family)device_get_match_data(dev);
 
        syscon_np = of_parse_phandle(dev->of_node, "usb3-dmp-syscon", 0);
        err = of_address_to_resource(syscon_np, 0, &res);