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 v4 net-next 1/5] net: dsa: ocelot: remove unnecessary pci_bar variables
Date:   Sat,  4 Dec 2021 10:28:54 -0800
Message-Id: <20211204182858.1052710-2-colin.foster@in-advantage.com>
In-Reply-To: <20211204182858.1052710-1-colin.foster@in-advantage.com>
References: <20211204182858.1052710-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?EmEZPZG/80lqXqSVP1pYE+Zxxkuddy0DTvToMhHPyj09bbm+2FgCcIP/kbgz?=
 =?us-ascii?Q?K5jFKvnmZW3lm+gTU/QwK0x40gSa1dLH2tv431ZvmgeAKN4pmSgirTaut2YO?=
 =?us-ascii?Q?AaansstfYXAU5pjwOf5lIQtxI4lX2SvKa+Vl08pEqguyt0kCwNuQrDb25TYR?=
 =?us-ascii?Q?cCDXKnvYSKy3vwICvKYj74fBp4e6Ofr8mikPI7s0T5jo8b1KGeSkZ6+SbsYU?=
 =?us-ascii?Q?rhS5EoW0Ytfa/XanMtmDywQ4mK8nmDVgDX0eJi5rilrHdSqRcRzgSdk3E9Zm?=
 =?us-ascii?Q?Kisw2ClrfY4gA+T+LyW1Uu6gTW28PcT2/CUxtcxLrRuH/upc5ZO0uSS6YnmP?=
 =?us-ascii?Q?Yfbc79+dVu+I0XFIiu38G5M97EFpaR065HFT1YApe2QDxE+Qv0MqCJP/GP6a?=
 =?us-ascii?Q?cJrPfL8KDL66nxvgdr7NVEEE9+Tk+OJuCMlir1ego16RnuzrEa7eDlENptmz?=
 =?us-ascii?Q?qDz87eFX9LYPJ2eg1O/LWQjVhhcIyWOtOBWIfJ04TalERDIqPZr0Qmqa5EG1?=
 =?us-ascii?Q?b6aIBACfcapRbP5XL5LNXx4wiqzFJkZVjCfJJolvmb/fMlvRbw4XOW2fROjW?=
 =?us-ascii?Q?skw/YR+tPTGsuw0YTDsQrszkoxDgYwhnbiEBHQU8MJRPoWF7rDgTA8BsfBV7?=
 =?us-ascii?Q?KYwVzNEHwm3RvVgG/d5S9ssBxE+h9FWQNIelvnCcdhWGh9/wduhesftl6SCY?=
 =?us-ascii?Q?sgiuJhIyWQCUNwnBoJ6ae7vuowGSyz9sVpkxNHjKCRuLajq0Z5nNQa+vSODg?=
 =?us-ascii?Q?JfxxPG1rh1WVlQDPzjX9wJLOLtK74dw/cYwj5aPdFh8b6T9YXQ4I+j/yU/mM?=
 =?us-ascii?Q?o77hzggmCufO94Pp2kSZ+kZ56yOl34UtCJWoTystsiHKIaPABi7qCe5gU8pp?=
 =?us-ascii?Q?fUB7p4zhzk5mF/FQXuQH88twKncQmVxWLXTDkA14fT0fgvtECaXtPWNKvAJj?=
 =?us-ascii?Q?+F2k/+xtmOtYdxleTwG5gssizpLwa++S6nQXk/8+JmeEY1w3Hore2FZle/Es?=
 =?us-ascii?Q?d+xguoB7BKKwkJ3Rzw6OMMWSbMzj8pVTzyO/d3Gi4NR+P6lH32XAHdDZOOUn?=
 =?us-ascii?Q?C9yBOQ04rwSMEcKWNBDJmi3NdRO3bTsiW4v/5xV22Vcrmu5DRR1O+N9WJlQ9?=
 =?us-ascii?Q?mpKCQWX9AtSiLxglJP3sW7iidGTjWf6sKR5IcJq/wWVTWWBSlxFsDK0g0l8l?=
 =?us-ascii?Q?7WghcQJLQoVPyVL2QwJDcjrRUFM/O6h3Cfc97vrXpTk+wRV9LPiq6gjhkaOX?=
 =?us-ascii?Q?eTOYs6xgvzJ73lglWrVSyMeZt1MKg2+s2gFTSkj+BlIear8UQwHRDc9vfVN4?=
 =?us-ascii?Q?xBJXq9VYOUgqsnshbTIhgPlS4oppdu+L7+98JNp9u07jUnxMoYQ7xFbGfhlK?=
 =?us-ascii?Q?eRRdjOdoz745gQfRs/VP3douhjqewWGfRYaS/EAsV0oIhELiDR752T3dNU07?=
 =?us-ascii?Q?XlQQOvW+U1nKBsgJ2sPYbxhX5yroKZTdomYnFmJK819OMql3PCJEYK2jfgc8?=
 =?us-ascii?Q?mtwgIfNcTBA8ISiZVXOmv0tiFJnmJ+rcEcZlJ5BJYtEZxEKzbrS6rIzeC9pl?=
 =?us-ascii?Q?i9D5CsgC5IVW5bQ2QLLXrZ5dXDfxTOEAC6Y2n7r3LbuUmTVJJQRO7mIJhOHZ?=
 =?us-ascii?Q?nz8a6NQ6RkZrparyCS7RPtfkhY6bAeS0ARhKMIosEceAai5EpojrDl90fRSt?=
 =?us-ascii?Q?/MiGsfsixfs5PlLQTTcDfU/NYTY=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: d19a7717-afb1-451e-6345-08d9b753f60e
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:29:08.9821
 (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: /rojjXcoDhtQ+dVtxasEhm6gUwGAxTNWNXSb3Momk2YXKhPOFeA0oQHVg1/i6eXbsiikz54UN6yKS45jwxvBe7X9oca6XH/Cf6tw1whvWqs=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2063
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