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:     Paolo Abeni <pabeni@redhat.com>,
        Eric Dumazet <edumazet@google.com>,
        linux-arm-kernel@lists.infradead.org,
        Russell King <linux@armlinux.org.uk>,
        linux-kernel@vger.kernel.org,
        Sean Anderson <sean.anderson@seco.com>
Subject: [PATCH net-next v3 21/47] net: fman: Move struct dev to mac_device
Date:   Fri, 15 Jul 2022 17:59:28 -0400
Message-Id: <20220715215954.1449214-22-sean.anderson@seco.com>
In-Reply-To: <20220715215954.1449214-1-sean.anderson@seco.com>
References: <20220715215954.1449214-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?YBtZYIfuDMm8njTf33RHh9zhfdA1TNMNd5j9MmQgG/fmW8j+UoZrns82AUyB?=
 =?us-ascii?Q?a2jxZyP+IFrgfM9jc8NYeVeiqLcLw64/uIMtlwEWTTX4AXPHIBFhDiVXj4uB?=
 =?us-ascii?Q?lyayGM1T4m7SuIRdi0cC7kUwLyCay5FTQkZT9dnQsXUoEx/bSe/O5mCzIuUx?=
 =?us-ascii?Q?ud80Jh4q9S7e4erqFkbMx1XCF9vlhumhZidMlUjf5mgOIrLzW0v8AkG3gmbJ?=
 =?us-ascii?Q?R7Ek9TgjHPCUR6oHRcO8pa4TbFlFCbp6ryHfIYb+bWQurXGoYy/XS27Sq9I5?=
 =?us-ascii?Q?q5RHkxTmK/YlSQQEy2zW5epddM6YYFoOV8e8N7O9qxx8S+FRtH+7YMgYrOTm?=
 =?us-ascii?Q?/jhktHpkLLLzcIIWsvGAZjcJv9a2uflG8rF/WDVMBoorHrWX/DkPY3LJdoit?=
 =?us-ascii?Q?wBKF/d6k6aQeVxvEq5vsiV0mx4VcnDOzjcC7F4yrjDz8FLqKvnnL9ZoADl9t?=
 =?us-ascii?Q?8jGHTytzckwRBNPKXtG2/gcmM2/h6rCVbMNvHqQRzjmaUdATul3caq8pZHEE?=
 =?us-ascii?Q?+PKVI3n/Db3+OBG4KCfkstFbCIXsRBIU3P5thvWUVmxA/PKDqkmHhY2krMk8?=
 =?us-ascii?Q?oCN5y5CbafPyk/FYIumfZleiYAjbvmr8qRpNhUkeZ0i1Mq0lv/RjrG1IZVdp?=
 =?us-ascii?Q?uf+GIAh8Mn4AFHzPR9haogm74h8/q9fJm4dmOVl7qbGNdZcSY43Hv0pBmIXk?=
 =?us-ascii?Q?9TsXO1KxjH25vw8lh6pjHefV+LfD8VCDcxpDETPHb+JPwSVQsP03jv+6WrAy?=
 =?us-ascii?Q?mRCC4TqX1N7MBCqQ+G+7tDmaCFIiHm2GsguhWDAm0LpBDzPHzVdOwUYOKHLF?=
 =?us-ascii?Q?EW2IeV7TpIhbLkx9m3CmScA7p4Ju3pdi9p8N7NOoZ4ckBrtDDw6ZG79qpEhk?=
 =?us-ascii?Q?Tl298Uz/4vgiIAGoWi7DnTaPk7A5+YR6mTbgonFSrj/XnSeoH4w0MzWxVAW0?=
 =?us-ascii?Q?kqAOoyW1xOIv4wkWixLXSLtu0xVQI3cwtowSyGLYHqqdjivyeBE1CT/KTlNj?=
 =?us-ascii?Q?yocCOFWbaqXFwtxzxWxc+yQq3s+tu7/gAEjkGTxjkly69hckHVrq1p37L0Yo?=
 =?us-ascii?Q?UGO6fPcDNUSXVaU9zaHV68zwrPE+oe3Ri9ahILc07Bapdis3a9ugHpweIYYu?=
 =?us-ascii?Q?5uTkOlih0Tq/mSV/yOITNO3ills5EMC4vw5NFdwn/2BtJo1Se6ZzCBWgdvlX?=
 =?us-ascii?Q?VBnDu1/qs5PScn3ZYi0PcnqffXOyM8eJg/CAx9FRHKrgFp6y1NcWjDHHnptd?=
 =?us-ascii?Q?NdzV0Co0C/KAYD6pY8kk1dC1B05qdWHH+E5Xaj+5Qsfm5Hr/KOUlVVEQNmE+?=
 =?us-ascii?Q?tMpo+iwufFCZn9fOIN7V5V2si5ibBnGyxZd0PSBeC3KfoUUqOpUqWZBcnHhB?=
 =?us-ascii?Q?72xSkhK2wMeXrkn9DNx8pm0U7UlmwXLivJnne5nKow49EiF3ZM+dUGSkn46q?=
 =?us-ascii?Q?nMGSD2jAWR/lqVGQJ+WXhLiDSo4TJ4sxfUyNihsOOXMSPXQ6RIo8pv7HSkIL?=
 =?us-ascii?Q?FqK1kPq9hDklvDb3qwhU7K2mBi/3FBUuTAYaGg2UYWulNkA5CHSUm3pjtC7n?=
 =?us-ascii?Q?10OPfZKE/S9yU6xrNlJae+VtApunfGMWGf8/+OBjylDxgaFAiJztfQ+ri/OO?=
 =?us-ascii?Q?eQ=3D=3D?=
X-OriginatorOrg: seco.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5686453a-ad6c-4222-3dc4-08da66ad819d
X-MS-Exchange-CrossTenant-AuthSource: VI1PR03MB4973.eurprd03.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2022 22:01:01.7225
 (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: CI7OBADJfdOakFawSbD46Xvqt6PlmrzDcI5ujnjmCGPi2N/O7lc9Fg6cJTzkC9KSBFSJkjQadD/73oJZ3Z2gsA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV2PR03MB8607
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 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

Move the reference to our device to mac_device. This way, macs can use
it in their log messages.

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

(no changes since v2)

Changes in v2:
- Remove some unused variables

 drivers/net/ethernet/freescale/fman/mac.c | 31 ++++++++---------------
 drivers/net/ethernet/freescale/fman/mac.h |  1 +
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c
index 8dd6a5b12922..5b3a6ea2d0e2 100644
--- a/drivers/net/ethernet/freescale/fman/mac.c
+++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -28,7 +28,6 @@ MODULE_LICENSE("Dual BSD/GPL");
 MODULE_DESCRIPTION("FSL FMan MAC API based driver");
 
 struct mac_priv_s {
-	struct device			*dev;
 	void __iomem			*vaddr;
 	u8				cell_index;
 	struct fman			*fman;
@@ -47,20 +46,16 @@ struct mac_address {
 
 static void mac_exception(void *handle, enum fman_mac_exceptions ex)
 {
-	struct mac_device	*mac_dev;
-	struct mac_priv_s	*priv;
-
-	mac_dev = handle;
-	priv = mac_dev->priv;
+	struct mac_device *mac_dev = handle;
 
 	if (ex == FM_MAC_EX_10G_RX_FIFO_OVFL) {
 		/* don't flag RX FIFO after the first */
 		mac_dev->set_exception(mac_dev->fman_mac,
 				       FM_MAC_EX_10G_RX_FIFO_OVFL, false);
-		dev_err(priv->dev, "10G MAC got RX FIFO Error = %x\n", ex);
+		dev_err(mac_dev->dev, "10G MAC got RX FIFO Error = %x\n", ex);
 	}
 
-	dev_dbg(priv->dev, "%s:%s() -> %d\n", KBUILD_BASENAME ".c",
+	dev_dbg(mac_dev->dev, "%s:%s() -> %d\n", KBUILD_BASENAME ".c",
 		__func__, ex);
 }
 
@@ -70,7 +65,7 @@ static int set_fman_mac_params(struct mac_device *mac_dev,
 	struct mac_priv_s *priv = mac_dev->priv;
 
 	params->base_addr = (typeof(params->base_addr))
-		devm_ioremap(priv->dev, mac_dev->res->start,
+		devm_ioremap(mac_dev->dev, mac_dev->res->start,
 			     resource_size(mac_dev->res));
 	if (!params->base_addr)
 		return -ENOMEM;
@@ -244,7 +239,7 @@ static void adjust_link_dtsec(struct mac_device *mac_dev)
 	fman_get_pause_cfg(mac_dev, &rx_pause, &tx_pause);
 	err = fman_set_mac_active_pause(mac_dev, rx_pause, tx_pause);
 	if (err < 0)
-		dev_err(mac_dev->priv->dev, "fman_set_mac_active_pause() = %d\n",
+		dev_err(mac_dev->dev, "fman_set_mac_active_pause() = %d\n",
 			err);
 }
 
@@ -261,7 +256,7 @@ static void adjust_link_memac(struct mac_device *mac_dev)
 	fman_get_pause_cfg(mac_dev, &rx_pause, &tx_pause);
 	err = fman_set_mac_active_pause(mac_dev, rx_pause, tx_pause);
 	if (err < 0)
-		dev_err(mac_dev->priv->dev, "fman_set_mac_active_pause() = %d\n",
+		dev_err(mac_dev->dev, "fman_set_mac_active_pause() = %d\n",
 			err);
 }
 
@@ -269,11 +264,9 @@ static int tgec_initialization(struct mac_device *mac_dev,
 			       struct device_node *mac_node)
 {
 	int err;
-	struct mac_priv_s	*priv;
 	struct fman_mac_params	params;
 	u32			version;
 
-	priv = mac_dev->priv;
 	mac_dev->set_promisc		= tgec_set_promiscuous;
 	mac_dev->change_addr		= tgec_modify_mac_address;
 	mac_dev->add_hash_mac_addr	= tgec_add_hash_mac_address;
@@ -316,7 +309,7 @@ static int tgec_initialization(struct mac_device *mac_dev,
 	if (err < 0)
 		goto _return_fm_mac_free;
 
-	dev_info(priv->dev, "FMan XGEC version: 0x%08x\n", version);
+	dev_info(mac_dev->dev, "FMan XGEC version: 0x%08x\n", version);
 
 	goto _return;
 
@@ -331,11 +324,9 @@ static int dtsec_initialization(struct mac_device *mac_dev,
 				struct device_node *mac_node)
 {
 	int			err;
-	struct mac_priv_s	*priv;
 	struct fman_mac_params	params;
 	u32			version;
 
-	priv = mac_dev->priv;
 	mac_dev->set_promisc		= dtsec_set_promiscuous;
 	mac_dev->change_addr		= dtsec_modify_mac_address;
 	mac_dev->add_hash_mac_addr	= dtsec_add_hash_mac_address;
@@ -383,7 +374,7 @@ static int dtsec_initialization(struct mac_device *mac_dev,
 	if (err < 0)
 		goto _return_fm_mac_free;
 
-	dev_info(priv->dev, "FMan dTSEC version: 0x%08x\n", version);
+	dev_info(mac_dev->dev, "FMan dTSEC version: 0x%08x\n", version);
 
 	goto _return;
 
@@ -446,7 +437,7 @@ static int memac_initialization(struct mac_device *mac_dev,
 	if (err < 0)
 		goto _return_fm_mac_free;
 
-	dev_info(priv->dev, "FMan MEMAC\n");
+	dev_info(mac_dev->dev, "FMan MEMAC\n");
 
 	goto _return;
 
@@ -507,7 +498,7 @@ static struct platform_device *dpaa_eth_add_device(int fman_id,
 		goto no_mem;
 	}
 
-	pdev->dev.parent = priv->dev;
+	pdev->dev.parent = mac_dev->dev;
 
 	ret = platform_device_add_data(pdev, &data, sizeof(data));
 	if (ret)
@@ -569,7 +560,7 @@ static int mac_probe(struct platform_device *_of_dev)
 
 	/* Save private information */
 	mac_dev->priv = priv;
-	priv->dev = dev;
+	mac_dev->dev = dev;
 
 	INIT_LIST_HEAD(&priv->mc_addr_list);
 
diff --git a/drivers/net/ethernet/freescale/fman/mac.h b/drivers/net/ethernet/freescale/fman/mac.h
index fed3835a8473..05dbb8b5a704 100644
--- a/drivers/net/ethernet/freescale/fman/mac.h
+++ b/drivers/net/ethernet/freescale/fman/mac.h
@@ -19,6 +19,7 @@ struct fman_mac;
 struct mac_priv_s;
 
 struct mac_device {
+	struct device		*dev;
 	struct resource		*res;
 	u8			 addr[ETH_ALEN];
 	struct fman_port	*port[2];
-- 
2.35.1.1320.gc452695387.dirty