net: mdio: xgene: Use device_get_match_data()

Use preferred device_get_match_data() instead of of_match_device() and
acpi_match_device() to get the driver match data. With this, adjust the
includes to explicitly include the correct headers.

Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/mdio/mdio-xgene.c b/drivers/net/mdio/mdio-xgene.c
index 7909d7caf45c51f262ab69793676a93ad66f656c..495fbe35b6ce20827c25b98b1bc07e0aabc0fff6 100644 (file)
--- a/drivers/net/mdio/mdio-xgene.c
+++ b/drivers/net/mdio/mdio-xgene.c
@@ -13,11 +13,13 @@
 #include <linux/io.h>
 #include <linux/mdio/mdio-xgene.h>
 #include <linux/module.h>
+#include <linux/of.h>
 #include <linux/of_mdio.h>
 #include <linux/of_net.h>
-#include <linux/of_platform.h>
 #include <linux/phy.h>
+#include <linux/platform_device.h>
 #include <linux/prefetch.h>
+#include <linux/property.h>
 #include <net/ip.h>
 
 u32 xgene_mdio_rd_mac(struct xgene_mdio_pdata *pdata, u32 rd_addr)
@@ -326,24 +328,11 @@ static int xgene_mdio_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
        struct mii_bus *mdio_bus;
-       const struct of_device_id *of_id;
        struct xgene_mdio_pdata *pdata;
        void __iomem *csr_base;
        int mdio_id = 0, ret = 0;
 
-       of_id = of_match_device(xgene_mdio_of_match, &pdev->dev);
-       if (of_id) {
-               mdio_id = (uintptr_t)of_id->data;
-       } else {
-#ifdef CONFIG_ACPI
-               const struct acpi_device_id *acpi_id;
-
-               acpi_id = acpi_match_device(xgene_mdio_acpi_match, &pdev->dev);
-               if (acpi_id)
-                       mdio_id = (enum xgene_mdio_id)acpi_id->driver_data;
-#endif
-       }
-
+       mdio_id = (uintptr_t)device_get_match_data(&pdev->dev);
        if (!mdio_id)
                return -ENODEV;