Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Sean Anderson <sean.anderson@seco.com>
To:     "David S . Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Madalin Bucur <madalin.bucur@nxp.com>, netdev@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        Paolo Abeni <pabeni@redhat.com>,
        Russell King <linux@armlinux.org.uk>,
        Eric Dumazet <edumazet@google.com>,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next 24/28] net: dpaa: Use mac_dev variable in dpaa_netdev_init
Date:   Fri, 17 Jun 2022 16:33:08 -0400
Message-Id: <20220617203312.3799646-25-sean.anderson@seco.com>
In-Reply-To: <20220617203312.3799646-1-sean.anderson@seco.com>
References: <20220617203312.3799646-1-sean.anderson@seco.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?R/magzXLFLSMruEULtZF/UbMkOfqDSPzIoYJw97ty5b+LI38t/zoHYHgsYCV?=
 =?us-ascii?Q?WAVreEdkUodm0IHao6GBvrDv8q+08lZJ7X4Sx3IcdKnGfa2u6UDvef+Fh89w?=
 =?us-ascii?Q?5VZJLDgR4uWQ9qLnor2SWHOfgsgq5JG3Fb/rkiPPTmDX6o3bDbqSst4pgoSV?=
 =?us-ascii?Q?J5JfwzbnSxa2gdgUI4T/379m8FiXAIqqRp4R0+6B0EunncVu9knq9Q9qGeq6?=
 =?us-ascii?Q?5JNw9wb0n8ZKR/fEGiDpvkYrY8xtdthGuv2tR8cOdfGzYMPzjIXt+mBRxEwZ?=
 =?us-ascii?Q?E6xLMZkr489iUFwxInjWBO8r6Qla4Qd2G+QcdcrS/GrX+PGC27n0FM4QK/Xw?=
 =?us-ascii?Q?VT1P2ZUkhU5eG97dvdcZRLFQgER/qhV1xzcUbReTDYvfffoTibXyzdlt+um4?=
 =?us-ascii?Q?w7smCxcJbBPrVqzDDUzyqWDqCIZ/GWwtmsFZUCK1Q8pzNSIpMu9C0aqCr7vE?=
 =?us-ascii?Q?dgbH5MndBAd3PkahuMve0ThtpMpAjDoN2r9uS0BQ8CzrbX/PGuHkdXDdtL+4?=
 =?us-ascii?Q?JrkalbHERZWwYVtEXtIcPoiPaNFnUvtSPt6iqI9bEy2YN1Xo2CN8u9KkV5N8?=
 =?us-ascii?Q?KWJfVh3AzUZzo41YQoaYYvjiD01e5IBHB7hunpZ6oweZFqwA1Yp+Hl3G38Zf?=
 =?us-ascii?Q?iVYtc/LoC0qrTW4Pgre0XS75YuZeOxl0gIgdxVA7H/Yy1JVBskTIsrYUWeWk?=
 =?us-ascii?Q?PpmUoB4ayzB99tAU9X3bx/PSr6sY0xtXMBepcBiSt4vcg0XBtOIIvMY9ZE+S?=
 =?us-ascii?Q?lwlO5FOy/7zGh1pButbv89sOQyE/2IbFl1HRUa/WJJnvj1ozA777xg/kydhG?=
 =?us-ascii?Q?c0EACUF4bMcU3CiYApehsf1MfiqLEhdz8JY7ZY5/zCCTGAqlekrizeGqR3MG?=
 =?us-ascii?Q?yPrK0NhaA0cS1mJbjiPA8mxy2yP4loapzYWS6Y45vxJVXwv/QdMQwdD26mYU?=
 =?us-ascii?Q?f4F+iHVvH+Io1qTR3KLHwebXKTpjHtX4gGfnWB+E6ukE30gYa0YOfPk1tQ5t?=
 =?us-ascii?Q?+Ucs0UAYLDsN347QWqd0I3Fj6cy2O80KPIEit43p4mWAfGqWSbJCz3BRNIEB?=
 =?us-ascii?Q?Twe7JDEJlRcTolLLjmlG57bqygGBHkEF0QI2UH7QiVhdSu6aFaA1NbS+BgxO?=
 =?us-ascii?Q?xIa8sPloCK+KlyFhwwgQptzlIMOp99TIjEdINiu0mx1iNOiO0T7simbRoXb1?=
 =?us-ascii?Q?cKZy9oTK7/fh1ka5BJhWau0VzAw90n/ERHFDXDOa/RhhLBsRwZhixf3gOWwh?=
 =?us-ascii?Q?EySVUQX5FVNSAniGm92wB3Hz48CwC/CVPex+GxUwz4bxp0j73gPtn4TGDo2P?=
 =?us-ascii?Q?t63/ovHJN4YSnwI1UohbGfgo4Z+zWfU23iayfn0RQQ6qoVs8HHa91CSwgNlZ?=
 =?us-ascii?Q?GG4wBafkQuR1VCxmKUHVxnuW65OSbrobBKAX+/TKJkH2ah6zg8rmz/olTPgD?=
 =?us-ascii?Q?/AgcwMZA6Huw+eC0NaNlevWpZWZOm90u36CdY5nuyIDrQ/ag1O74w/CvtCQK?=
 =?us-ascii?Q?D6l3ra2fOgopYXTcloN1ChWZxFnNlZRm1KE8P8k7RXJh/W4iCYNBludpwIp/?=
 =?us-ascii?Q?zt+euJ0PtCtCmtbBg64L20R52hIFvyOI7gsN/1XEHJek9dH+lc0VibvL98lH?=
 =?us-ascii?Q?k2y/Q0z+xfxcLTgu98vDMfPsKB9vL50nFryEsveKjqzVu9BayRFcp87NSti+?=
 =?us-ascii?Q?hgK49ncYShVPb4xMnSC5Zf+5DeTKc19JaewQ85IjtjExPrZgZ1fnND3nJET4?=
 =?us-ascii?Q?OLdGBBwTAv2XAxKwrwsTMkWkNvt8tiA=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: fb06326d-9a39-4680-61dc-08da50a0c26f
X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4973.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jun 2022 20:34:21.5602
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bebe97c3-6438-442e-ade3-ff17aa50e733
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: CsO6pl1K7JSYzPJ12TccOzCV87Vvcf5w9Q9ZGXgtb9txsAZ7EnZvoMs3UFryxiiGVTbEoaGnopThkdhI1dla2g==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR03MB6838
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

There are several references to mac_dev in dpaa_netdev_init. Make things a
bit more concise by adding a local variable for it.

Signed-off-by: Sean Anderson <sean.anderson@seco.com>
---

 drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
index d443d53c4504..9d31fd1d8ad0 100644
--- a/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
+++ b/drivers/net/ethernet/freescale/dpaa/dpaa_eth.c
@@ -203,6 +203,7 @@ static int dpaa_netdev_init(struct net_device *net_dev,
 {
 	struct dpaa_priv *priv = netdev_priv(net_dev);
 	struct device *dev = net_dev->dev.parent;
+	struct mac_device *mac_dev = priv->mac_dev;
 	struct dpaa_percpu_priv *percpu_priv;
 	const u8 *mac_addr;
 	int i, err;
@@ -216,10 +217,10 @@ static int dpaa_netdev_init(struct net_device *net_dev,
 	}
 
 	net_dev->netdev_ops = dpaa_ops;
-	mac_addr = priv->mac_dev->addr;
+	mac_addr = mac_dev->addr;
 
-	net_dev->mem_start = (unsigned long)priv->mac_dev->vaddr;
-	net_dev->mem_end = (unsigned long)priv->mac_dev->vaddr_end;
+	net_dev->mem_start = (unsigned long)mac_dev->vaddr;
+	net_dev->mem_end = (unsigned long)mac_dev->vaddr_end;
 
 	net_dev->min_mtu = ETH_MIN_MTU;
 	net_dev->max_mtu = dpaa_get_max_mtu();
@@ -246,7 +247,7 @@ static int dpaa_netdev_init(struct net_device *net_dev,
 		eth_hw_addr_set(net_dev, mac_addr);
 	} else {
 		eth_hw_addr_random(net_dev);
-		err = priv->mac_dev->change_addr(priv->mac_dev->fman_mac,
+		err = priv->mac_dev->change_addr(mac_dev->fman_mac,
 			(const enet_addr_t *)net_dev->dev_addr);
 		if (err) {
 			dev_err(dev, "Failed to set random MAC address\n");
-- 
2.35.1.1320.gc452695387.dirty