lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 28 Apr 2019 14:53:21 +0200 From: Petr Štetiar <ynezz@...e.cz> To: netdev@...r.kernel.org, devicetree@...r.kernel.org, linux-kernel@...r.kernel.org, Nicolas Ferre <nicolas.ferre@...rochip.com>, "David S. Miller" <davem@...emloft.net> Cc: Andrew Lunn <andrew@...n.ch>, Florian Fainelli <f.fainelli@...il.com>, Heiner Kallweit <hkallweit1@...il.com>, Rob Herring <robh+dt@...nel.org>, Frank Rowand <frowand.list@...il.com>, Srinivas Kandagatla <srinivas.kandagatla@...aro.org>, Maxime Ripard <maxime.ripard@...tlin.com>, Alban Bedel <albeu@...e.fr>, Petr Štetiar <ynezz@...e.cz> Subject: [PATCH v2 3/4] net: macb: Drop nvmem_get_mac_address usage of_get_mac_address now uses NVMEM under the hood, so it's not necessary to call it manually anymore. Signed-off-by: Petr Štetiar <ynezz@...e.cz> --- drivers/net/ethernet/cadence/macb_main.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 3da2795..1b98bc8 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c @@ -4172,16 +4172,10 @@ static int macb_probe(struct platform_device *pdev) bp->rx_intr_mask |= MACB_BIT(RXUBR); mac = of_get_mac_address(np); - if (mac) { + if (mac) ether_addr_copy(bp->dev->dev_addr, mac); - } else { - err = nvmem_get_mac_address(&pdev->dev, bp->dev->dev_addr); - if (err) { - if (err == -EPROBE_DEFER) - goto err_out_free_netdev; - macb_get_hwaddr(bp); - } - } + else + macb_get_hwaddr(bp); err = of_get_phy_mode(np); if (err < 0) { -- 1.9.1
Powered by blists - more mailing lists