From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C4C58C4332F for ; Tue, 18 Jan 2022 02:37:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346382AbiARChl (ORCPT ); Mon, 17 Jan 2022 21:37:41 -0500 Received: from ams.source.kernel.org ([145.40.68.75]:43710 "EHLO ams.source.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344078AbiARCe0 (ORCPT ); Mon, 17 Jan 2022 21:34:26 -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 D38D9B8124F; Tue, 18 Jan 2022 02:33:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B7FA2C36AEB; Tue, 18 Jan 2022 02:33:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1642473214; bh=dARacxu/D/r3/qAKRLXt0JAPblqXXdVmv79AzCb4CkQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZO1B/rKmDLIt1rTPQh1rlwmxTUFEqnpntEgWgCKPMYV0IhfEoc7ccOT4ID9O5aROW 4enmomqW+pqXRc9V/qP1x3fshoYo4tehrzArxz9TMLb/jCliY8E62Z4qWzJZxiN5NK RPYpKC/Hs5Q0MwdnnLFVoEkhkSIZ0s8ViIS6ITvQK+V7mtLgJUPmtvv+D8xJ7a/BGO Q6BKsSB2cjkVJk0fBXeu549udWXFJ+jT7BiSVI4g3ldmHDVWZt9VCmGUNVWKQdrhDz oiV+m42XqpMK+ds/uLZ3/czbyWPofL5iCT4SvXoRNd6PrLJQPdR/pARdBXzu7mFVJG opMwoxD8UHkTw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , "David S . Miller" , Sasha Levin , arnd@arndb.de, linux@roeck-us.net, tanghui20@huawei.com, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 029/188] amd: ni65: use eth_hw_addr_set() Date: Mon, 17 Jan 2022 21:29:13 -0500 Message-Id: <20220118023152.1948105-29-sashal@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220118023152.1948105-1-sashal@kernel.org> References: <20220118023152.1948105-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: netdev@vger.kernel.org From: Jakub Kicinski [ Upstream commit 69ede3097b871dbc793dd6e21f38fde56d273963 ] IO reads, so save to an array then eth_hw_addr_set(). Fixes build on x86 (32bit). Signed-off-by: Jakub Kicinski Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/amd/ni65.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/amd/ni65.c b/drivers/net/ethernet/amd/ni65.c index 032e8922b4829..8ba579b89b758 100644 --- a/drivers/net/ethernet/amd/ni65.c +++ b/drivers/net/ethernet/amd/ni65.c @@ -251,7 +251,7 @@ static void ni65_recv_intr(struct net_device *dev,int); static void ni65_xmit_intr(struct net_device *dev,int); static int ni65_open(struct net_device *dev); static int ni65_lance_reinit(struct net_device *dev); -static void ni65_init_lance(struct priv *p,unsigned char*,int,int); +static void ni65_init_lance(struct priv *p,const unsigned char*,int,int); static netdev_tx_t ni65_send_packet(struct sk_buff *skb, struct net_device *dev); static void ni65_timeout(struct net_device *dev, unsigned int txqueue); @@ -418,6 +418,7 @@ static int __init ni65_probe1(struct net_device *dev,int ioaddr) { int i,j; struct priv *p; + u8 addr[ETH_ALEN]; unsigned long flags; dev->irq = irq; @@ -444,7 +445,8 @@ static int __init ni65_probe1(struct net_device *dev,int ioaddr) return -ENODEV; for(j=0;j<6;j++) - dev->dev_addr[j] = inb(ioaddr+cards[i].addr_offset+j); + addr[j] = inb(ioaddr+cards[i].addr_offset+j); + eth_hw_addr_set(dev, addr); if( (j=ni65_alloc_buffer(dev)) < 0) { release_region(ioaddr, cards[i].total_size); @@ -566,7 +568,7 @@ static int __init ni65_probe1(struct net_device *dev,int ioaddr) /* * set lance register and trigger init */ -static void ni65_init_lance(struct priv *p,unsigned char *daddr,int filter,int mode) +static void ni65_init_lance(struct priv *p,const unsigned char *daddr,int filter,int mode) { int i; u32 pib; -- 2.34.1