From: Stephen Boyd <swboyd@chromium.org>
To: Rob Herring <robh@kernel.org>
Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
Arnd Bergmann <arnd@arndb.de>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Grygorii Strashko <grygorii.strashko@ti.com>,
"David S. Miller" <davem@davemloft.net>,
Rob Herring <robh+dt@kernel.org>,
Frank Rowand <frowand.list@gmail.com>,
linux-omap@vger.kernel.org
Subject: [PATCH v2 2/6] drivers: net: davinci_mdio: Use of_device_get_match_data()
Date: Fri, 22 Jan 2021 19:44:24 -0800 [thread overview]
Message-ID: <20210123034428.2841052-3-swboyd@chromium.org> (raw)
In-Reply-To: <20210123034428.2841052-1-swboyd@chromium.org>
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>
---
Please ack so Rob can apply.
drivers/net/ethernet/ti/davinci_mdio.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/ti/davinci_mdio.c b/drivers/net/ethernet/ti/davinci_mdio.c
index cfff3d48807a..a4efd5e35158 100644
--- a/drivers/net/ethernet/ti/davinci_mdio.c
+++ b/drivers/net/ethernet/ti/davinci_mdio.c
@@ -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 {
--
https://chromeos.dev
next prev parent reply other threads:[~2021-01-23 3:46 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-23 3:44 [PATCH v2 0/6] Stop NULLifying match pointer in of_match_device() Stephen Boyd
2021-01-23 3:44 ` [PATCH v2 1/6] media: renesas-ceu: Use of_device_get_match_data() Stephen Boyd
2021-01-25 8:30 ` Geert Uytterhoeven
2021-01-23 3:44 ` Stephen Boyd [this message]
2021-01-26 13:11 ` [PATCH v2 2/6] drivers: net: davinci_mdio: " Grygorii Strashko
2021-01-23 3:44 ` [PATCH v2 3/6] serial: stm32: " Stephen Boyd
2021-01-23 3:44 ` [PATCH v2 4/6] usb: usb251xb: " Stephen Boyd
2021-01-23 3:44 ` [PATCH v2 5/6] hwmon: (lm70) Avoid undefined reference to match table Stephen Boyd
2021-01-23 6:09 ` Guenter Roeck
2021-01-26 18:30 ` Rob Herring
2021-01-23 3:44 ` [PATCH v2 6/6] of/device: Don't NULLify match table in of_match_device() with CONFIG_OF=n Stephen Boyd
2021-01-25 8:33 ` Geert Uytterhoeven
2021-01-25 9:46 ` Arnd Bergmann
2021-01-26 18:21 ` [PATCH v2 0/6] Stop NULLifying match pointer in of_match_device() Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210123034428.2841052-3-swboyd@chromium.org \
--to=swboyd@chromium.org \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=frowand.list@gmail.com \
--cc=geert@linux-m68k.org \
--cc=grygorii.strashko@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®