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 v2 net-next 1/5] net: dsa: ocelot: remove unnecessary pci_bar variables
Date:   Fri,  3 Dec 2021 17:00:46 -0800
Message-Id: <20211204010050.1013718-2-colin.foster@in-advantage.com>
In-Reply-To: <20211204010050.1013718-1-colin.foster@in-advantage.com>
References: <20211204010050.1013718-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?F9VjqBa2EJ6B2tw8MSZwjZi0PHQ9GNr4qhthcD9vugbWsk7yPMoFqsfUWKpP?=
 =?us-ascii?Q?3+83Lo+S2Tia9UHWbCQxuo4JwRaIMUU6d4xZ9vjQReMOa84G04YyS59x+HSX?=
 =?us-ascii?Q?bbrN2tuaSNhHJ8COMkeUIp/nVgu/fNbZuhoJh9b6WHONBqsylk5GhHpr8sds?=
 =?us-ascii?Q?yc0P9s5/DKh0xpCrbtGdcbRJ1BUeo4fSz2GLoqvj4vWXQ2wDuMm6yDjAzN+V?=
 =?us-ascii?Q?1WIMLIOQ+JkADEfYQcpRm4tfZEyDPYUIhIu0ficQCeg7qqnahcaHIr48PH3+?=
 =?us-ascii?Q?I3fBBpYyhiTC+gHrH3uSPiMqSNwpOBoo4cK/6tZ6kh6eXJz6ugRSyhv1dJ2Q?=
 =?us-ascii?Q?PJd1wvRhq5FRfrTyPfSpZ5gfSKu5EO5ggUQFSLpxxBCrppljSAQEeUIDWyiS?=
 =?us-ascii?Q?S8lrSghQXu+MU9Q36pG9kcxdbc8YVhCexrKU6xDAkysVy1MsVzsE7Wyno9Cu?=
 =?us-ascii?Q?dCH3BYYJ5pI3eu7vLF0dV1dVCXetl/64dM5+8GsPNejIcTZjv1a5b36A41Gl?=
 =?us-ascii?Q?M91eb9APHWgye/5DWPKA7BiqsCpzL8HBIjzNfeCYejLYr9hhQkJSI/L7155i?=
 =?us-ascii?Q?0iY1iVvJMkNFWLCUSQrVW4KvH/hZnrsvOm33Zvy8ZOeg0B+Kr+7jHW6yFmk+?=
 =?us-ascii?Q?tw0JGAQWTkfqe2kZHIBsAviFnz6/diYk7azUsYCrFFd3WK7aAcqV4MGThAw/?=
 =?us-ascii?Q?OMhca7VBK2XvZo4xStmFwCoZ8ZNsijXP1BAuIkKwo86ppA1wCNjSmZ6sSqiA?=
 =?us-ascii?Q?85ydrDaWtAs8wZvSV4ykcv+6SbM08E0NAwRLbV9xbF34oP1bgo6xnemLkZMW?=
 =?us-ascii?Q?PYFXX37MVtGCs2g8+Z/SVkYEupjuJdIsDAcV+o+5//7EvFNwrnoSdgTrAVTT?=
 =?us-ascii?Q?z+wufAQLsws7sOZZTuvzv9jgi7f7Et9LAljCoCxFu1UafE2k5H7ACmkZO2jS?=
 =?us-ascii?Q?PNoqGaqdRVV7RoGyG4eARowKcLmHMwYn2QPH65UbnpZYZHxHCdRDNqZ6YrZ/?=
 =?us-ascii?Q?cK9QIbqZ+w/V7kIjYATAuf4nxO0AKFiYybpxAbW6rdVtHP1YyrkE+r4C+9Jc?=
 =?us-ascii?Q?7F/adGPNChw1feIsWNOOWtmkszf1NvXwHsIF8gYWfwls4JWuKEaoy4Gp1BWq?=
 =?us-ascii?Q?WN1UojgHmWX+jLh2Gd5iz1l5GHcVvSfQh1tGrlTy7S/mOj9fpQ68eAlX/xmu?=
 =?us-ascii?Q?zGOXrMutpL6W7+tV7VuE60d0xR5HrvnAKTnKF4/XXWLMGrEifCfQwcihaxfj?=
 =?us-ascii?Q?Xu/DeRVwdjmYc8A1Iv+BXXf7XtWSFdPx7Ye8ZjLAfvIu4sxus4Wr5zm09N5C?=
 =?us-ascii?Q?daq9UixhnhSr1Sxp6lO1sbJSa6e1eQP2idNdyq74LJtIlcl1MYyRt1FdSOBQ?=
 =?us-ascii?Q?/8wR3gBB/G90L6MkYqZ+F3Tvmlet3YyILIaZYCOCY1YUVbrKJVyoJJK8nGIO?=
 =?us-ascii?Q?zwLDQizd/V+E5ng8mmFbi+XXy+QJ/BE78v+VKOsjKzf7OC70bohB9Lu/g+/q?=
 =?us-ascii?Q?Sg7+JGOuRrpj9stA6swuNv5g3hNI+zrHUcaUkZqhfQSG7C5TBAU6WGUgNGES?=
 =?us-ascii?Q?j6aHTay8kFFIaaEaMvELykK8DBGK8aWN0N8HBTfkxhGkGsiZN97KmNpNSX0n?=
 =?us-ascii?Q?5+f/klqvECwa9Je94PBxYPFHpVgcJgZjhOPmfMiXXkjt2nS5ORqjtaTffFuA?=
 =?us-ascii?Q?S/wwSw=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8ace868a-0bb0-459a-af57-08d9b6c18b2e
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2021 01:01:03.1940
 (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: X4Vg02C3VA8CNOHqLv2mxlu5VgAcxUo3Ki12oGqx3LnH0xs0+l9WDnaMY1ThniC6RyH6T2oJCMeQQR8p6Egsq1e+buA5gt1th9R9vvSXeIY=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR10MB5701
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