From: Joachim Eastwood Date: Wed, 20 May 2015 18:03:09 +0000 (+0200) Subject: stmmac: drop unnecessary dt checks in stmmac_probe_config_dt X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~12126^2~240^2 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=def5cd3cfd01704ca9bad1c32e75f0144b746511;p=mirror_ubuntu-focal-kernel.git stmmac: drop unnecessary dt checks in stmmac_probe_config_dt Since the caller already check the presence of a of_node there is no need to repeat the check in stmmac_probe_config_dt. There is also no point in checking the return value of the of_match_device function since if there wasn't match in the first place we would never be in this function. Signed-off-by: Joachim Eastwood Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index e8d4c96a282a..1664c0186f5b 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -112,13 +112,7 @@ static int stmmac_probe_config_dt(struct platform_device *pdev, const struct of_device_id *device; struct device *dev = &pdev->dev; - if (!np) - return -ENODEV; - device = of_match_device(dev->driver->of_match_table, dev); - if (!device) - return -ENODEV; - if (device->data) { const struct stmmac_of_data *data = device->data; plat->has_gmac = data->has_gmac;