From: David S. Miller Date: Sun, 16 Jun 2019 20:53:41 +0000 (-0700) Subject: Merge branch 'stmmac-cleanups-for-stmmac_mdio_reset' X-Git-Tag: v5.3-rc1~140^2~223 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=4e18a8a149d5577a171ddc5fe80cc715041b193d;p=linux.git Merge branch 'stmmac-cleanups-for-stmmac_mdio_reset' Martin Blumenstingl says: ==================== stmmac: cleanups for stmmac_mdio_reset This is a successor to my previous series "stmmac: honor the GPIO flags for the PHY reset GPIO" from [0]. It contains only the "cleanup" patches from that series plus some additional cleanups on top. I broke out the actual GPIO flag handling into a separate patch which is already part of net-next: "net: stmmac: use GPIO descriptors in stmmac_mdio_reset" from [1] I have build and runtime tested this on my ARM Meson8b Odroid-C1. [0] https://patchwork.kernel.org/cover/10983801/ [1] https://patchwork.ozlabs.org/patch/1114798/ ==================== Signed-off-by: David S. Miller --- 4e18a8a149d5577a171ddc5fe80cc715041b193d diff --cc drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c index 7cbc01f316fa,7cbc01f316fa..2a47d3b98379 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_pci.c @@@ -73,7 -73,7 +73,6 @@@ static void common_default_data(struct plat->has_gmac = 1; plat->force_sf_dma_mode = 1; -- plat->mdio_bus_data->phy_reset = NULL; plat->mdio_bus_data->phy_mask = 0; /* Set default value for multicast hash bins */