summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoachim Eastwood <manabian@gmail.com>2015-07-17 00:26:05 +0200
committerDavid S. Miller <davem@davemloft.net>2015-07-21 05:45:56 +0200
commit0dacf3f664818ab1e3e0af8ef22a86c89f34d125 (patch)
treed5d454982ff42bd6fa86e63c365dce83890b9747
parentMerge branch 'tipc-separate-link-and-aggregation' (diff)
downloadlinux-0dacf3f664818ab1e3e0af8ef22a86c89f34d125.tar.xz
linux-0dacf3f664818ab1e3e0af8ef22a86c89f34d125.zip
stmmac: use of_device_get_match_data to retrieve of match data
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c8
1 files 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;