From 18755e270666ce869289bceb734d25eae2be9da9 Mon Sep 17 00:00:00 2001

From: Krzysztof Halasa <khalasa@piap.pl>

Date: Thu, 18 Feb 2021 13:34:42 +0100

Subject: [Backport 18755e270666] Marvell Sky2 Ethernet adapter: fix warning

 messages.

sky2.c driver uses netdev_warn() before the net device is initialized.

Fix it by using dev_warn() instead.

Signed-off-by: Krzysztof Halasa <khalasa@piap.pl>

Link: https://lore.kernel.org/r/m3a6s1r1ul.fsf@t19.piap.pl

Signed-off-by: Jakub Kicinski <kuba@kernel.org>

---

 src/sky2.c | 5 ++---

 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/sky2.c b/src/sky2.c

index ebe1406c6e64821f26e9f025d9ce8f01b0f74c42..dbec8e187a6821558b5bf8373364eeb3487bf06d 100644

--- a/src/sky2.c

+++ b/src/sky2.c

@@ -4806,12 +4806,11 @@ static struct net_device *sky2_init_netdev(struct sky2_hw *hw, unsigned port,

 	if (!is_valid_ether_addr(dev->dev_addr)) {

 		struct sockaddr sa = { AF_UNSPEC };

-		netdev_warn(dev,

-			    "Invalid MAC address, defaulting to random\n");

+		dev_warn(&hw->pdev->dev, "Invalid MAC address, defaulting to random\n");

 		eth_hw_addr_random(dev);

 		memcpy(sa.sa_data, dev->dev_addr, ETH_ALEN);

 		if (sky2_set_mac_address(dev, &sa))

-			netdev_warn(dev, "Failed to set MAC address.\n");

+			dev_warn(&hw->pdev->dev, "Failed to set MAC address.\n");

 	}

 	return dev;

-- 

2.31.1