drivers: net: davinci_mdio: Use of_device_get_match_data()
authorStephen Boyd <swboyd@chromium.org>
Sat, 23 Jan 2021 03:44:24 +0000 (19:44 -0800)
committerRob Herring <robh@kernel.org>
Tue, 26 Jan 2021 18:17:31 +0000 (12:17 -0600)
Use the more modern API to get the match data out of the of match table.
This saves some code, lines, and nicely avoids referencing the match
table when it is undefined with configurations where CONFIG_OF=n.

Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Frank Rowand <frowand.list@gmail.com>
Cc: <linux-omap@vger.kernel.org>
Reviewed-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20210123034428.2841052-3-swboyd@chromium.org
drivers/net/ethernet/ti/davinci_mdio.c

index cfff3d48807a4e3078a297c545bcbe3b2e391ae9..a4efd5e3515847a3b484c4664084aec194ae400f 100644 (file)
@@ -358,20 +358,16 @@ static int davinci_mdio_probe(struct platform_device *pdev)
        }
 
        if (IS_ENABLED(CONFIG_OF) && dev->of_node) {
-               const struct of_device_id       *of_id;
+               const struct davinci_mdio_of_param *of_mdio_data;
 
                ret = davinci_mdio_probe_dt(&data->pdata, pdev);
                if (ret)
                        return ret;
                snprintf(data->bus->id, MII_BUS_ID_SIZE, "%s", pdev->name);
 
-               of_id = of_match_device(davinci_mdio_of_mtable, &pdev->dev);
-               if (of_id) {
-                       const struct davinci_mdio_of_param *of_mdio_data;
-
-                       of_mdio_data = of_id->data;
-                       if (of_mdio_data)
-                               autosuspend_delay_ms =
+               of_mdio_data = of_device_get_match_data(&pdev->dev);
+               if (of_mdio_data) {
+                       autosuspend_delay_ms =
                                        of_mdio_data->autosuspend_delay_ms;
                }
        } else {