netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Joachim Eastwood <manabian@gmail.com>
To: peppe.cavallaro@st.com, davem@davemloft.net
Cc: Joachim Eastwood <manabian@gmail.com>, netdev@vger.kernel.org
Subject: [PATCH net-next 1/8] stmmac: use of_device_get_match_data to retrieve of match data
Date: Fri, 17 Jul 2015 00:26:05 +0200	[thread overview]
Message-ID: <1437085572-11371-2-git-send-email-manabian@gmail.com> (raw)
In-Reply-To: <1437085572-11371-1-git-send-email-manabian@gmail.com>

By using of_device_get_match_data() the code that retrieve
match data can be simplified quite a bit.

Signed-off-by: Joachim Eastwood <manabian@gmail.com>
---
 drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
index f3918c7e7eeb..89e40ddc0391 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -109,13 +109,11 @@ static int stmmac_probe_config_dt(struct platform_device *pdev,
 				  const char **mac)
 {
 	struct device_node *np = pdev->dev.of_node;
+	const struct stmmac_of_data *data;
 	struct stmmac_dma_cfg *dma_cfg;
-	const struct of_device_id *device;
-	struct device *dev = &pdev->dev;
 
-	device = of_match_device(dev->driver->of_match_table, dev);
-	if (device->data) {
-		const struct stmmac_of_data *data = device->data;
+	data = of_device_get_match_data(&pdev->dev);
+	if (data) {
 		plat->has_gmac = data->has_gmac;
 		plat->enh_desc = data->enh_desc;
 		plat->tx_coe = data->tx_coe;
-- 
1.8.0

  reply	other threads:[~2015-07-16 22:26 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-16 22:26 [PATCH net-next 0/8] stmmac clean up for 4.3 part1 Joachim Eastwood
2015-07-16 22:26 ` Joachim Eastwood [this message]
2015-07-16 22:26 ` [PATCH net-next 2/8] stmmac: clean up platform/of_match data retrieval Joachim Eastwood
2015-07-16 22:26 ` [PATCH net-next 3/8] stmmac: introduce stmmac_get_platform_resources() Joachim Eastwood
2015-07-16 22:26 ` [PATCH net-next 4/8] stmmac: make stmmac_probe_config_dt return the platform data struct Joachim Eastwood
2015-07-16 22:26 ` [PATCH net-next 5/8] stmmac: export probe_config_dt() and get_platform_resources() Joachim Eastwood
2015-07-16 22:26 ` [PATCH net-next 6/8] stmmac: add proper probe function to dwmac-lpc18xx Joachim Eastwood
2015-07-16 22:26 ` [PATCH net-next 7/8] stmmac: add proper probe function to dwmac-meson Joachim Eastwood
2015-07-16 22:26 ` [PATCH net-next 8/8] stmmac: drop custom_* fields from plat_stmmacenet_data Joachim Eastwood
2015-07-21  3:46 ` [PATCH net-next 0/8] stmmac clean up for 4.3 part1 David Miller

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=1437085572-11371-2-git-send-email-manabian@gmail.com \
    --to=manabian@gmail.com \
    --cc=davem@davemloft.net \
    --cc=netdev@vger.kernel.org \
    --cc=peppe.cavallaro@st.com \
    /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;
as well as URLs for NNTP newsgroup(s).