From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Cc:     Vladimir Oltean <vladimir.oltean@nxp.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        Alexandre Belloni <alexandre.belloni@bootlin.com>,
        UNGLinuxDriver@microchip.com, Andrew Lunn <andrew@lunn.ch>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Russell King <linux@armlinux.org.uk>
Subject: [PATCH v3 net-next 1/5] net: dsa: ocelot: remove unnecessary pci_bar variables
Date:   Sat,  4 Dec 2021 10:21:25 -0800
Message-Id: <20211204182129.1044899-2-colin.foster@in-advantage.com>
In-Reply-To: <20211204182129.1044899-1-colin.foster@in-advantage.com>
References: <20211204182129.1044899-1-colin.foster@in-advantage.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?y3Jkrf241xkFnAy/XzkblNo3+CwSuhnF3WgwsobKLRWbiScHk5o+NPsnnx9d?=
 =?us-ascii?Q?f2N2P7jJ+EWXMbaHcYNvVamvomlWjDkD1QodFn+nMO3GOkJ15GwYh5SD1wHk?=
 =?us-ascii?Q?nYW44T2nMmmjyYFAuZW7lUrbQVP58sd39EQJdZEMbTL1/E2jqaQ6T3bzEs6i?=
 =?us-ascii?Q?MsHgMKnG4MLPdzoKDOflR5ezQLO9fxDpwin9wLgMlRJ07o38FZaEzs7Z3toG?=
 =?us-ascii?Q?sU47vCXe78jc7UgO2aMC9YaulY+VWCzur1sd5mZ/lD+yQOcYyhx+I9BtcOXS?=
 =?us-ascii?Q?WdtwAZficTiIKZf0hDrF0pHi/DRTgm1V5BlE0dPTGZV7jmwTCsa4ec4UQ7GU?=
 =?us-ascii?Q?YErVvMOQMYCkuzt5LYlKecUyeMnDg1T5uvJgMKxhV09pRmrALS/AcU4OR59f?=
 =?us-ascii?Q?TcE6P9GIU32tcmG+i33dC6OrCJ+2NUQLXAPO0o0Yrq0o456m3KGo2aAhhunc?=
 =?us-ascii?Q?vV+7XvNvFb1yCM/a+oHMVbEShtGheh/q8OaL155XflL5tpsbmlFXV7GyvaLX?=
 =?us-ascii?Q?c9tkBXmwQX9mv9RvqPWw+JNKgkGCG9ypxQHSbj7w8+BoO/y6+4OlE7pSkstG?=
 =?us-ascii?Q?uwl2onxAk4GxsHPT9AT4hnzXqMBCUR6tWX1Xa0xoPpUkEWnlAp+BO4MpxkPV?=
 =?us-ascii?Q?Fes6LzZBbEdfDdjLsUwlYBjXkLAhZqC0k9F3wPGpAaLV66tEKu1R0Xl968Q4?=
 =?us-ascii?Q?Yh9+IPk1PrXqC9yjDhczYbfFLJgSf6K4nq5MASA+P7od+b0wg+qpYMnYJ/cJ?=
 =?us-ascii?Q?yVRPXxqns5U9MpOpEfrnCGL1e0KfvSIjJnpRGK9Xi7L5OWSL1EbSs6bgxcTs?=
 =?us-ascii?Q?cvz/0OxDjCn20eA0xvjsylHN9uZYk3rk/eBR4tjz0fJkacjpdc9lPdqNNIGZ?=
 =?us-ascii?Q?LzqaBiCo58FmVDo/b+ECp14qVu7piRrUAOg/fSy6ENT8MQPViAtQhZ+hrQXy?=
 =?us-ascii?Q?YGvhcxIeD9W/EcOljJ8oSGxQWzyaj4GpYZF61518ohBhWgqGD8krLx5E6wxv?=
 =?us-ascii?Q?I+bsMI34ObcxQXv0SXQaH8Do1TmYUBprRNqjbnvslpj5xnfmNFMGbps/nqCi?=
 =?us-ascii?Q?CrEtpPFqP41YuwNe6ZqG2e1z1quKCLVT7uPzhc2XCAhBnytOSth92I/tzfbi?=
 =?us-ascii?Q?+kG9vJTSfGGVQhkiUC/gpyZsxDlu9DGJl/QUfOcosgm6xKVdQ7POp0gMbeVz?=
 =?us-ascii?Q?niVSJ8chhQIhZCiKYdgZN3FQ+ZcowDWo48JU++YIAWBA8/iZTVWFJOPyF8Yw?=
 =?us-ascii?Q?XnmeVza9lrifCpG2gzUa0GiSULsBarrMFyhlJkW/7QzkZzetgRUFT/rLAF6G?=
 =?us-ascii?Q?J+3E9fKbK0oHSM3BnaYV6fUpsDCW6aWI1pGkm01L4JRe76jBZO8XuGF1bNxF?=
 =?us-ascii?Q?QuGCCyA53jrh7ytXeQCJ2NPnYox/WcGfSXeuQ0SnO/CKCkmQPwAG/Q92FmJv?=
 =?us-ascii?Q?c6cyNlZcfrsQ56D8hsWwsp4Y3XYvF+qeWIR97Wv6J8Ie68FScwRhRrGYALeT?=
 =?us-ascii?Q?+v9qm6F5SM8Cvg66YaQIUrbbRh2FVA1GzgFU+58C8SgVFvrT80VmymuSprQl?=
 =?us-ascii?Q?kiOIclXyh3m8Fn4P/gzbeLMR6SnM+DEyRI4wBibJbfV0k4iQ4wto+MXin7qt?=
 =?us-ascii?Q?+66AxcuHKUJOdA3EbsLG1fqY5t9Bw2EFRRpKP7SyQeM11Gpv5hLVfwvBnZ8C?=
 =?us-ascii?Q?15hhvrFY+mo4mInkWS8w+J+YLXE=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8a031f61-5c24-4f55-af0f-08d9b752eb3f
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2021 18:21:41.3485
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: xJfFQtSY50stwscqbXoLFBtbFqjGIgvLZW3gr/yrk7WF26kTIl91GqMvYM6g2f8F3cM9AO1Qy/2NT6wD/ClNuOXREBKQM88kOVTxz5zjQ+w=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2061
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The pci_bar variables for the switch and imdio don't make sense for the
generic felix driver. Moving them to felix_vsc9959 to limit scope and
simplify the felix_info struct.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
Reviewed-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/dsa/ocelot/felix.h         |  2 --
 drivers/net/dsa/ocelot/felix_vsc9959.c | 10 ++++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h
index dfe08dddd262..183dbf832db9 100644
--- a/drivers/net/dsa/ocelot/felix.h
+++ b/drivers/net/dsa/ocelot/felix.h
@@ -25,8 +25,6 @@ struct felix_info {
 	u16				vcap_pol_max;
 	u16				vcap_pol_base2;
 	u16				vcap_pol_max2;
-	int				switch_pci_bar;
-	int				imdio_pci_bar;
 	const struct ptp_clock_info	*ptp_caps;
 
 	/* Some Ocelot switches are integrated into the SoC without the
diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 9add86eda7e3..0676e204c804 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -21,6 +21,8 @@
 #define VSC9959_TAS_GCL_ENTRY_MAX	63
 #define VSC9959_VCAP_POLICER_BASE	63
 #define VSC9959_VCAP_POLICER_MAX	383
+#define VSC9959_SWITCH_PCI_BAR		4
+#define VSC9959_IMDIO_PCI_BAR		0
 
 static const u32 vsc9959_ana_regmap[] = {
 	REG(ANA_ADVLEARN,			0x0089a0),
@@ -2230,8 +2232,6 @@ static const struct felix_info felix_info_vsc9959 = {
 	.num_mact_rows		= 2048,
 	.num_ports		= 6,
 	.num_tx_queues		= OCELOT_NUM_TC,
-	.switch_pci_bar		= 4,
-	.imdio_pci_bar		= 0,
 	.quirk_no_xtr_irq	= true,
 	.ptp_caps		= &vsc9959_ptp_caps,
 	.mdio_bus_alloc		= vsc9959_mdio_bus_alloc,
@@ -2290,10 +2290,8 @@ static int felix_pci_probe(struct pci_dev *pdev,
 	ocelot->dev = &pdev->dev;
 	ocelot->num_flooding_pgids = OCELOT_NUM_TC;
 	felix->info = &felix_info_vsc9959;
-	felix->switch_base = pci_resource_start(pdev,
-						felix->info->switch_pci_bar);
-	felix->imdio_base = pci_resource_start(pdev,
-					       felix->info->imdio_pci_bar);
+	felix->switch_base = pci_resource_start(pdev, VSC9959_SWITCH_PCI_BAR);
+	felix->imdio_base = pci_resource_start(pdev, VSC9959_IMDIO_PCI_BAR);
 
 	pci_set_master(pdev);
 
-- 
2.25.1