diff options
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c')
-rw-r--r-- | drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 1c83a44c547b..7a0072003f34 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | |||
@@ -83,6 +83,10 @@ static int stmmac_probe_config_dt(struct platform_device *pdev, | |||
83 | dma_cfg->mixed_burst = | 83 | dma_cfg->mixed_burst = |
84 | of_property_read_bool(np, "snps,mixed-burst"); | 84 | of_property_read_bool(np, "snps,mixed-burst"); |
85 | } | 85 | } |
86 | plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode"); | ||
87 | if (plat->force_thresh_dma_mode) { | ||
88 | plat->force_sf_dma_mode = 0; | ||
89 | pr_warn("force_sf_dma_mode is ignored if force_thresh_dma_mode is set."); | ||
86 | 90 | ||
87 | return 0; | 91 | return 0; |
88 | } | 92 | } |
@@ -113,14 +117,11 @@ static int stmmac_pltfr_probe(struct platform_device *pdev) | |||
113 | const char *mac = NULL; | 117 | const char *mac = NULL; |
114 | 118 | ||
115 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 119 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
116 | if (!res) | ||
117 | return -ENODEV; | ||
118 | |||
119 | addr = devm_ioremap_resource(dev, res); | 120 | addr = devm_ioremap_resource(dev, res); |
120 | if (IS_ERR(addr)) | 121 | if (IS_ERR(addr)) |
121 | return PTR_ERR(addr); | 122 | return PTR_ERR(addr); |
122 | 123 | ||
123 | plat_dat = pdev->dev.platform_data; | 124 | plat_dat = dev_get_platdata(&pdev->dev); |
124 | if (pdev->dev.of_node) { | 125 | if (pdev->dev.of_node) { |
125 | if (!plat_dat) | 126 | if (!plat_dat) |
126 | plat_dat = devm_kzalloc(&pdev->dev, | 127 | plat_dat = devm_kzalloc(&pdev->dev, |