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>,
        Eric Dumazet <edumazet@google.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Paolo Abeni <pabeni@redhat.com>, netdev@vger.kernel.org
Cc:     Camelia Groza <camelia.groza@nxp.com>,
        Madalin Bucur <madalin.bucur@nxp.com>,
        linux-kernel@vger.kernel.org (open list),
        linux-arm-kernel@lists.infradead.org,
        linuxppc-dev@lists.ozlabs.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next v5 11/14] net: dpaa: Use mac_dev variable in dpaa_netdev_init
Date:   Fri,  2 Sep 2022 17:57:33 -0400
Message-Id: <20220902215737.981341-12-sean.anderson@seco.com>
In-Reply-To: <20220902215737.981341-1-sean.anderson@seco.com>
References: <20220902215737.981341-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?B30O6cme8wh9glCT3CZgZMgv7BuZu7gO+Y57x9qZJD8chVFJeYrWICXeQVnK?=
 =?us-ascii?Q?EMQMVZBjzhWig0rqCam/HKuy6VLvJbLLSBCvpQhujLr2JKs7Qns25FNEIDwq?=
 =?us-ascii?Q?hThHUCajz+iBBB5l+yRizTxJ23q0oo0uNYx8tuiYEYG3e0CVChNshD+zIFbk?=
 =?us-ascii?Q?25qShUZ7c0T7cbkLt+VcVTE7t2QwECNslxjpSTmiHezYY9TKLDd19Uhw2RYM?=
 =?us-ascii?Q?LxJW4lSkvUwSLm1vTRMDC39boECxeVJhuP7/rZN83L+BPB7qSWPLXeQLvoIZ?=
 =?us-ascii?Q?3KE9wRUn9Ieschn7hN1v2RZgNvnY4MqZSSDlO5PxXOOY7VhLLi7NSn9x/nYT?=
 =?us-ascii?Q?aB/hLz7X+3GYg1qWeRGa0n9qeSFMRddmDcOanNMdhv31pGmImjQGVNNJn5tg?=
 =?us-ascii?Q?7gb94lOim8RiRaEWbsmq379eBLmaYheMxubz412J83F7JPA4ryII1wCvTbKg?=
 =?us-ascii?Q?KI+MlLb2ac7wi435hjyWdjLfjpkhz3DslVCgAk1RqTHoaor/xvSV5V7EZMCQ?=
 =?us-ascii?Q?AtM0VYrLuMxuTb5VEiaX8MzCB7Yp5f3u1NU17ViIphjuQAWge8WGsvg66sG3?=
 =?us-ascii?Q?4mMMHChhnqNbcFmVhH+ic03TGIMCuhZ0Hf0EXK+UJt/diuXzrr4He2Si7NDy?=
 =?us-ascii?Q?WgDyHdptBXeboPunAZQtsSa1zpL1WCfw8I/pm9jUzV+Zj/U1AwInBeFZLxls?=
 =?us-ascii?Q?HcCYde0miskP84dmVewa3045kNb0XyDvFbR9x0TL33jTAR+VgI7TO391+BCl?=
 =?us-ascii?Q?gZMsO0v9/7B1tmiF0AnmFmj0kRhiNhftP5fmV7MnkE++7RQfUwXmGp/AcB0p?=
 =?us-ascii?Q?Pna+Q/gnWUIeRdwq/YjI0lo7Nf6QaLdHPF99wPEx+znYtGOgFEpLMugzVWQA?=
 =?us-ascii?Q?zrX9ZjQzGMY7kGnG4BlZiB1dCft+gfj/duL3zTHKZsJlr/obIjF1b59dRAuF?=
 =?us-ascii?Q?BxshFoCENSAgeIDpBcyvu54QNFGfpK7rp84/eQL7jdC9DJhVDhRhFhfOqzXI?=
 =?us-ascii?Q?++fTL05Io2HObeMBm6wKtx2gwHhZqYpuLByvZoBSqwWHq03O3U8qkkJfeMW5?=
 =?us-ascii?Q?T+8JEyz1XbwvGclvONUxr79Ugponamc+tTJ9Z/SHAP3YI9VPxplyVC6LyZhQ?=
 =?us-ascii?Q?SwsgbKtDgO2CNo9h4CZiNui/IMYN2qypMHQZN+CmDGmKFFV/iKxOk7gf/l5Y?=
 =?us-ascii?Q?gUWvz9MmOuKTJH3yHuQpTX0NjKTlamPeyu8qOcaxTuxT6Is39ERTXCRxfDvw?=
 =?us-ascii?Q?nBFU3k67KyDNspszPWSZ9GGBkJHen47hQOjgn5Kf0F+0oBPsukymLF/FRR7b?=
 =?us-ascii?Q?Hp5snc40ELgFgpbp3YflmKJOAfhJ9gdDvLGPbCA38jnTIZ73lMHVUsmgIRgH?=
 =?us-ascii?Q?Lcs3m/PYh5NaStVMyz3g2Zvfei/B0E4bpOcGaVqk5t3z/RZxI+12lBvY5C8U?=
 =?us-ascii?Q?4RK0cWVjok4q13/pWA4AtQ77b723FbX68g+wlfSilhgL5Kty6HpVNVjuzaK5?=
 =?us-ascii?Q?TwLqOKdUgIl2ZTInbb0KymtyEmrFXla8HRyuePFQCSu9mew723Zk8j/QPEeJ?=
 =?us-ascii?Q?XkcIk6jNc2zmX60ovONRKbxMGI1hhPYmE1JdQ6W6havjMglrOOyAfh5UaGej?=
 =?us-ascii?Q?bQ=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7637fdd6-8897-4dbe-c2d5-08da8d2e3a05
X-MS-Exchange-CrossTenant-AuthSource: DB7PR03MB4972.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2022 21:58:10.9689
 (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: KMRb7fQiRw1u1LY4sLsJ42bHslO5HttgY/OpZHzvCA2OQhz7LBwKYBLb6QFeGnprq9VkAcjXfCjxI8HLYg4U2w==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB4085
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>
Acked-by: Camelia Groza <camelia.groza@nxp.com>
---

(no changes since v4)

Changes in v4:
- Use mac_dev for calling change_addr

 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 d378247a6d0c..7df3bf5a9c03 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 = 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