From:   Colin Foster <colin.foster@in-advantage.com>
To:     linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-gpio@vger.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        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>,
        Ioana Ciornei <ioana.ciornei@nxp.com>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Russell King <linux@armlinux.org.uk>,
        Lars Povlsen <lars.povlsen@microchip.com>,
        Steen Hegelund <Steen.Hegelund@microchip.com>,
        Linus Walleij <linus.walleij@linaro.org>,
        Philipp Zabel <p.zabel@pengutronix.de>,
        Heikki Krogerus <heikki.krogerus@linux.intel.com>,
        Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Subject: [RFC PATCH v4 net-next 01/23] net: dsa: ocelot: remove unnecessary pci_bar variables
Date:   Mon, 15 Nov 2021 22:23:06 -0800
Message-Id: <20211116062328.1949151-2-colin.foster@in-advantage.com>
In-Reply-To: <20211116062328.1949151-1-colin.foster@in-advantage.com>
References: <20211116062328.1949151-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?L+evD8vh1JGvX2DYFeyVZAZDXc2YBO05u9aRvAj1FAkwGTA/kAy7AU+72r4x?=
 =?us-ascii?Q?7gCVK/DpjO+2tg0o1dMp5F3Z1XcZ0xRtRLhGXHYMDIEJJqGJRCeUhppaqnMB?=
 =?us-ascii?Q?8hLJm6aTql9bT92nGD5MqpA7IUcegF5MxmUmcD+NKPdRtTalwdsX9hah79D9?=
 =?us-ascii?Q?ldUhpNMS5lvVRNmecbN8xfTy4P3cJVh8zJxbj8kpYylaTfGVEY8ljvFX6Dw0?=
 =?us-ascii?Q?ff3oF+qLHL/e7wEsRyetVI/LA7QwqW7GMtvvtizphbRMoDsYEqAdOyBDg/yu?=
 =?us-ascii?Q?noYF/YQnf/OFjeXppAcKRVIyXqXkuA2/oe1aX4BM+fH56xxqR9av/GXwahVq?=
 =?us-ascii?Q?qt5OHAUIIeZ/cAoTa9AcMQNrBGCB+FToOYR8oXAWCZ+ODpTuUZUe/mw9XESJ?=
 =?us-ascii?Q?8iL88dSEORsIqO2azKHsC02vlxcO6E6M9s4T5ZjoBiiAZDbmDmgr4fSBC2EI?=
 =?us-ascii?Q?pZT6My+Q8EHcmLmVa1xNp7mGJul6qEBRoGsHf5Hz5XJD1iW+Yv54EcAF4n8U?=
 =?us-ascii?Q?bS5zlGZpWdrqPBKHs7gvPCpe7HJG8vgxUtaufu8hBM1qsO6D02znbiDOqiwi?=
 =?us-ascii?Q?MUPmVKlZKNMzvAXnOVIx8V9UA+19G8qHsQ3InJBvOrYH/8pXIHrbW6wieQpj?=
 =?us-ascii?Q?EBrlOpq08xLdiHgNyL324q0HJ9joT4QDjURHimmI4pwODPyDvW3itsU9ho+r?=
 =?us-ascii?Q?owv4T2l/SkqJcUjhugF56/jATz6VYiW3dLNVi3u0JpRYybqKtTNQYmiuueHJ?=
 =?us-ascii?Q?95HFXmKMTAjQv3qdSHcVyJCC4LqGx2MY5PPoB1rHELa2gexX8s+zyPeBiUan?=
 =?us-ascii?Q?hTVFL7ULo4b5fyz58EMCqOYfgvAYopmVQMYZDnzeIT+OFVzhMZRmq0Emjytj?=
 =?us-ascii?Q?6l/CXHiHlPO1T6ptcJTxpD+zjCIpxrVY1rOtvSSrI7LYT5lDc68lTYvpaKMT?=
 =?us-ascii?Q?cnhUocnhdpY//7vmAL/H12hEbIaxKhCc5F5rYKARlSf9hnIc0j+bqHk2g2en?=
 =?us-ascii?Q?pYCHeIIlxr5/TwiB+Y6W+yx/DfqeTjRtnQVUieIDSvqd7B1E+LIcdh1raMgG?=
 =?us-ascii?Q?Y+hiTouDY1tKaTywlSC1zDFDhrMtPSWRhDiJxpmZpLkvHD5o3zWPgWGWj9Zd?=
 =?us-ascii?Q?fRCDFZBvfUdTNocTxAVWJ4SQfZqU85eQCTdzuutc+kXHw0u6/P1VWh2oDOHQ?=
 =?us-ascii?Q?kVEKxNNDdO0m2FwIHDj+EjVc0oNtVAGM7siwWMmo2cCNPfIMNHCX2vqoznw2?=
 =?us-ascii?Q?xxCZMT4i66qI97DpNZb3k/oPeXdTP8iRjHdF2P0Vqxjm6hRIVLYn629+P5qq?=
 =?us-ascii?Q?XRI2ZyBqa9AuT0D+ejjckOnZnsixU7ZSVKM/AW82bmdGxuCnOE4iNOgZnHEk?=
 =?us-ascii?Q?PDYgxChRZjWOl7RgNPXP40VowSm53r4fagnn4Ef8/AKTtUd9x1glqU7H60uB?=
 =?us-ascii?Q?3DNlRI2/u9NYX/dtOTz5246KFcvp5nzgskYib4kfUd9ulNDbByhwF9NlaZ3s?=
 =?us-ascii?Q?8LSbAeNFDoJn8xbovYh54KiHGNAfJ+q0bba6T68B/i9UQf+JlJon7/DyySlv?=
 =?us-ascii?Q?9PIj2UII7NSL3j6gfI2FE07T4CreHmqQbDF83PyCz7Z9y7gHU+FyyF6xY7VJ?=
 =?us-ascii?Q?tI2yEEP7Z3zAMJ+LGaMr2D6O5vRfmeHe6YVwgNeAgegQmzj5N26B0IIJoJvY?=
 =?us-ascii?Q?9GojkFQe/FVyC6YfSqNzwIvRFc8=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: a8c00fa1-5892-431e-adcb-08d9a8c9a31d
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Nov 2021 06:23:43.0018
 (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: 4piEpF/bV2Rowv3hbRjrwDj9z07GkF7esUds4RlXbIifn4bU2U3K2nx1vZbrx+9pPOMrDGQRFT4hDxZovfDrGnfDgZAOjqndZIaAl1/BFec=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1001MB2383
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>
---
 drivers/net/dsa/ocelot/felix.h         |  2 --
 drivers/net/dsa/ocelot/felix_vsc9959.c | 11 +++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/net/dsa/ocelot/felix.h b/drivers/net/dsa/ocelot/felix.h
index be3e42e135c0..d7da307fc071 100644
--- a/drivers/net/dsa/ocelot/felix.h
+++ b/drivers/net/dsa/ocelot/felix.h
@@ -21,8 +21,6 @@ struct felix_info {
 	int				num_ports;
 	int				num_tx_queues;
 	struct vcap_props		*vcap;
-	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 45c5ec7a83ea..0b3ccfd54603 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
@@ -1357,8 +1357,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,
@@ -1386,6 +1384,9 @@ static irqreturn_t felix_irq_handler(int irq, void *data)
 	return IRQ_HANDLED;
 }
 
+#define VSC9959_SWITCH_PCI_BAR 4
+#define VSC9959_IMDIO_PCI_BAR 0
+
 static int felix_pci_probe(struct pci_dev *pdev,
 			   const struct pci_device_id *id)
 {
@@ -1417,10 +1418,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