Received: by 2002:a05:6a10:af89:0:0:0:0 with SMTP id iu9csp3384166pxb; Mon, 17 Jan 2022 19:13:41 -0800 (PST) X-Google-Smtp-Source: ABdhPJwdgWyg/0j1rxRil98je1oS3dMy8oUKPhDMeeoJO2Lx+73xUMWOWwgPZV+X8l9LDW9HbolT X-Received: by 2002:a17:903:32c8:b0:14a:8776:c89b with SMTP id i8-20020a17090332c800b0014a8776c89bmr22205489plr.68.1642475621704; Mon, 17 Jan 2022 19:13:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642475621; cv=none; d=google.com; s=arc-20160816; b=S9nBnis50ApKakz57vI3U3vKHwkOU6ZBb6deBRhwkx6eIxZGV6v+oZ7AVskSIpLf7e lntLQFaU/ifmz9+EwRrGi22Wp6hoiD8MH6RVnG2vKD3Wz+uy8eQ94WXOG343osS9ILi3 ktT9LvmGy3aYqzYrvlQbkzgffNYqOR60kTde3inxxH/ye805a2fA4kpT+wBrhV1B+Xye JyqHdPvstvhCmGrllFyju4XmCgPeB2AJypFgK8J3k8S3zjEFOA3WffgRSWLdffdC9CP1 FP+W/CRlUoMhZePqXX6PPGwy2yR+gxet+hdPPOeEUHR18ZM33ft8hazLonMnMj3z3pWn YBYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cIpj+4LbXxvtoqpMyPhLWX4cXdMZb1g9uDMdWaihDnY=; b=Itw2GHJeAn+RgBJQxq4n163M+Ol5covt3WYowLK5lqAzd5EbnMOKQRBjsuRluX5S90 XROcO+RxFgADVsch11Fy9XswEHXcgyWgoGOInsB2dyaPGfNx/hoDBYb8+dCxp1AxZZpy 4+MUcVan0oiTwclnvHAGaqiUF85X9XSbG4U1z+RYwXIolL9DyInSdtdKlouUfg4y5dOW K4P+DihTx5+b+2gubseyX3Obh6lgdWxzjYkHlcJKTMYqjh3YBrvl0C+hlisW7njPiiYz 27aLCyUuqFdAWpwPnEgoRTWbwqii63X9AVvpGXe/BY29H8OO/qol6UlXJG9TomenyDxc HTqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bVRCLX0O; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g16si5653496pfv.161.2022.01.17.19.13.29; Mon, 17 Jan 2022 19:13:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=bVRCLX0O; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S245023AbiARCW3 (ORCPT + 99 others); Mon, 17 Jan 2022 21:22:29 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:36246 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244949AbiARCWL (ORCPT ); Mon, 17 Jan 2022 21:22:11 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 2EC04B8123A; Tue, 18 Jan 2022 02:22:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5C1EC36AE3; Tue, 18 Jan 2022 02:22:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642472528; bh=m1BlRPMjqADOPfF+pcH7G6HNhcalXPTaj0y9Fw/8EN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bVRCLX0ORtNED++wrP4aJ2VvpephpQmOPTvZQLhVvxi1JVVXdQ6OwZsDL1cGn6pPg U+QHoEOs73uXwAB2rwW8gTxvWjBuh37FeTlMkws3v2calH3dwO5yonHG6BfK8gEVZb 40BTYIK4Fa4woYVfk2bcnmQf2k6PIY4fAtX75QuYhYTe+w27u9LzEjznPvMhRrrIu7 Bij4qckBussQlHHK3Gk3rLJCL7s91YSBVWJoe+8hBsJ8Rh2GRoalapjBjsU84u8y0k ot3+vtFSxUTZ3ne5U/VbSExKaJuTfrGDvHJu1ju7hUNCnO4BAJXFD4BtStE3Dj5pVN pAyx+pdnmaQ3A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , "David S . Miller" , Sasha Levin , gregkh@linuxfoundation.org, u.kleine-koenig@pengutronix.de, fthain@linux-m68k.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.16 042/217] 8390: mac8390: use eth_hw_addr_set() Date: Mon, 17 Jan 2022 21:16:45 -0500 Message-Id: <20220118021940.1942199-42-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118021940.1942199-1-sashal@kernel.org> References: <20220118021940.1942199-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jakub Kicinski [ Upstream commit 973a34c087f43b61b26570110a284faf48d08d5d ] Use temp to pass to the reading function, the function is generic so can't fix there. Fixes m68k build. Signed-off-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/8390/mac8390.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/8390/mac8390.c b/drivers/net/ethernet/8390/mac8390.c index 91b04abfd6875..7fb819b9b89a5 100644 --- a/drivers/net/ethernet/8390/mac8390.c +++ b/drivers/net/ethernet/8390/mac8390.c @@ -292,6 +292,7 @@ static bool mac8390_rsrc_init(struct net_device *dev, struct nubus_dirent ent; int offset; volatile unsigned short *i; + u8 addr[ETH_ALEN]; dev->irq = SLOT2IRQ(board->slot); /* This is getting to be a habit */ @@ -314,7 +315,8 @@ static bool mac8390_rsrc_init(struct net_device *dev, return false; } - nubus_get_rsrc_mem(dev->dev_addr, &ent, 6); + nubus_get_rsrc_mem(addr, &ent, 6); + eth_hw_addr_set(dev, addr); if (useresources[cardtype] == 1) { nubus_rewinddir(&dir); -- 2.34.1