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 v5 net-next 1/4] net: dsa: ocelot: remove unnecessary pci_bar variables
Date:   Tue,  7 Dec 2021 09:00:27 -0800
Message-Id: <20211207170030.1406601-2-colin.foster@in-advantage.com>
In-Reply-To: <20211207170030.1406601-1-colin.foster@in-advantage.com>
References: <20211207170030.1406601-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?QsCrP1xLODCAZTwQFfx2/ryRdFtFiZ1SCMGkioe5v+JB1qnIdXg3BSoEgIBw?=
 =?us-ascii?Q?Pwlq04uH0rHSUa1RY8uVJ+dqKmhDS9W49pTQVe2Wl3CyXdOO3/3kAXkELVRk?=
 =?us-ascii?Q?jeZxMbTelewnocd45ozE6LlN/bkUQ7cx5WbYkb4awvG2M0mAE8aP7biNlQuj?=
 =?us-ascii?Q?y/whjevQ30hikBdATaCX2reO+e4g6hrjLRG6naVSy840U7QmEm8xkHfdNB9r?=
 =?us-ascii?Q?XH4ogQJdNCuS2P22tANPyc/DTYX2mc+PEEPLmqVEAjbQTFMOL18Xg0KacC+h?=
 =?us-ascii?Q?Oq4BnT5JAm3Q4ksILhbiQZlJ4B8y97ESNfo6KpUqZsg7YLJAmzc2UMmuEQty?=
 =?us-ascii?Q?V3Yo2PUdHyXptJWXEQxvMC+p3DUCZ5YHz7YD/sSv+5AoWNpj0xYRwBUYyAhJ?=
 =?us-ascii?Q?CdnQPf+TKwT+OcvFIdcN1u5cNmj4bmCHFZYPGftApzrhyKP2OfnypQXVtq5F?=
 =?us-ascii?Q?0Hk9TJE8SlTr4oa3wXxpNnG8iVJypj6tK2yk/y7ct2vl8lQZxqdSJJogdzy7?=
 =?us-ascii?Q?p0o9nmGILN81LaNTNPur3UM7C6XZ3Wlzev2uIseveCZ5Bu5k4Dniq3kselTd?=
 =?us-ascii?Q?Q0lRssZF+loEZfyo1hyDt2i+DNtPH41oVuTLqFBJ89YsUKBUbQCjjiI4e15Y?=
 =?us-ascii?Q?XIC/i44L8F4l3ly+NcUoeg3sav1Opj++lVsI7DsGzq8KFswqWoXQEzV5hEVF?=
 =?us-ascii?Q?oi28VSk46cYLq2J9P9s4g3CsvNJUt/k0stWF9vwsYpa6YikU7Mzg5RMRPTVY?=
 =?us-ascii?Q?aT8rKIsqEQdiFO/GMHJRsBBJ9d2bzXUcmQ4/i2MMlDTl1kfwyqUPNZ9ypvOh?=
 =?us-ascii?Q?w34pdz/m7Gj+PcihsKYY8CU1EfTTw0HPgnxSCf88iDPKGXHnHny4ZMFgipI9?=
 =?us-ascii?Q?UYMBMgtJP4JoWQCh1vx82x+KqFFYtidZkbxpfI5kkTJ8W0RsXEiuSY49ivIp?=
 =?us-ascii?Q?PPZmVSRXS834n8fnefKZ9YZwbmZ5nS9CZ6uuKUjlGg5mk3givJTri5Hhxjed?=
 =?us-ascii?Q?BraXS/xKLqtUapaLphbydJVWEfc/8TV7pZiMGuwqW6EV1xr0U8RrKqhCda+G?=
 =?us-ascii?Q?hZ/eAhKqpx8G9UDH7fQd2Mr8jeVRp1nLP/oUb9njlyXNAoIVTrHG+gO4q2ZH?=
 =?us-ascii?Q?U0So2KAJpUU6QZ7RiPWSgsYcDEZRmLv/MWisZHIzuF2mB7aIVEyTGMMxRjbn?=
 =?us-ascii?Q?MT0ajKxWBim/5qi6J7f5bUSE6wMDgwigjV+qRyNoici9c4VOcBNqNKeu2Upu?=
 =?us-ascii?Q?U1rhTHsIrrWqIe8WckftKYEvHrKd33nQP9rFgFtXbQzBIjFkyJkEHJIRcdgG?=
 =?us-ascii?Q?dmveL5PHboGSt/QH8O5vYW61qk+njAhccSVZvmPn/IHbguO5xZwRqupkd1as?=
 =?us-ascii?Q?DNXAPZVTus24ESH/VAAl6bkISUQD4nxPwZDMaI5guKZlC01g4Am+ojoins8H?=
 =?us-ascii?Q?bgyCROOrl4VvrxFb3PPdLC5AoiopJ+/LcHVC+L99vAze7LQ52pxQML5QPwNZ?=
 =?us-ascii?Q?u1Jpqj5BXvDphvoc0eUG/myNA7Gl5svzX9fMia/5SZoWXqxYsWZFd4OQhzkU?=
 =?us-ascii?Q?8aNYmVFV+DMVh4OOID6jevOFiVdd1TI7owBAuUTPXVpi/FNuIrxSS/pCE5pN?=
 =?us-ascii?Q?0hndbFjJfkbqmXaTaGQ+JJe11bAzlITqgeDXM8/k7uAgqeThGrgAPb48MDOR?=
 =?us-ascii?Q?I/Wzqg=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 522f664e-992a-4102-8416-08d9b9a319db
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Dec 2021 17:00:41.6438
 (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: Yk3SaHEIOgpZasBZE86SvEh46JOWVuXe6o+IQcrUEhnLaO0BPKUQy2f/f95BLpXontlmIm2J3G0+IlWvtyOQ+yrvxL7sBL/+1vw8iy4842Q=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO6PR10MB5441
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