Received-SPF: pass (google.com: domain of linux-kernel+bounces-70355-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
From: Minda Chen <minda.chen@starfivetech.com>
To: Conor Dooley <conor@kernel.org>,
	=?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= <kw@linux.com>,
	Rob Herring <robh+dt@kernel.org>,
	Bjorn Helgaas <bhelgaas@google.com>,
	Lorenzo Pieralisi <lpieralisi@kernel.org>,
	Daire McNamara <daire.mcnamara@microchip.com>,
	Emil Renner Berthing <emil.renner.berthing@canonical.com>,
	Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>
Cc: devicetree@vger.kernel.org,
	linux-kernel@vger.kernel.org,
	linux-riscv@lists.infradead.org,
	linux-pci@vger.kernel.org,
	Paul Walmsley <paul.walmsley@sifive.com>,
	Palmer Dabbelt <palmer@dabbelt.com>,
	Albert Ou <aou@eecs.berkeley.edu>,
	Philipp Zabel <p.zabel@pengutronix.de>,
	Mason Huo <mason.huo@starfivetech.com>,
	Leyfoon Tan <leyfoon.tan@starfivetech.com>,
	Kevin Xie <kevin.xie@starfivetech.com>,
	Minda Chen <minda.chen@starfivetech.com>
Subject: [PATCH v15 08/23] PCI: microchip: Change the argument of plda_pcie_setup_iomems()
Date: Sun, 18 Feb 2024 18:17:27 +0800
Message-Id: <20240218101732.113397-7-minda.chen@starfivetech.com>
In-Reply-To: <20240218101732.113397-1-minda.chen@starfivetech.com>
References: <20240218101732.113397-1-minda.chen@starfivetech.com>
Content-Type: text/plain
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?us-ascii?Q?EZ5QsstCIdvt3KqpF/4aK67XvwI/xDQTVggNQieJDza42rm2ONjP6e3KCU+W?=
 =?us-ascii?Q?ehYAUAfrZ7mMPim4wMuYrLHN7f1jxlKUm4H3fZXzOU09GyZzBy6jRY6FP3sC?=
 =?us-ascii?Q?8C7NxhU6YoGAHQMr2ifU2MQhQba+q3o4EECm2A1m+Ibe4Mc58cwhZffJfyCp?=
 =?us-ascii?Q?5UqvZDOnSLvGSl1UuSkAZ09NpqvuICOHhHomyJWRekKKT7i6ic+r51tNe1/c?=
 =?us-ascii?Q?2UY5Vjh3yCuf/wgnxbbV8/yRswkPWJXg6o9qgfJ8mplkIJY/3yYJNUmW7f23?=
 =?us-ascii?Q?pFeIVgZaD8p4nYBN3eYRc8OL1xCmpwin4YEbuyuAPPqvedjYMs17i7MYSz7w?=
 =?us-ascii?Q?IwLPkj2kM1LEU+Z3UP0WMVGpnkjLrcPh7oraj5Hf7/QoH8ni0fBYK/fzGNNr?=
 =?us-ascii?Q?rgibANqA4ocoKp/O45LxxMrt/FUgkSJ6a8ehfEq1Gi4X/ayJEJhB16K5utcR?=
 =?us-ascii?Q?2zcffWciEAxbhXPewARqmGQcEPdqTWPhz74HpNTiejjiU7Ymvo7oawzGvcFC?=
 =?us-ascii?Q?irzbc1rstsxcqa2YmNr/44z4mVV1b1DDDMrctgw0rluGEtqROpb6gBhEG5Ef?=
 =?us-ascii?Q?UpFXiVkam8klXAi2ywZy/BXh/t7hJ+WpAWP7EbcrKPedEEUugRPG0z8BBgIe?=
 =?us-ascii?Q?o5xNDuRUkdcNIvPAuch03rxPMsOLW7rCiicIScC0MQ+52vPPGsXggZILZu/t?=
 =?us-ascii?Q?QiMZ+Vwmil7UfRuod855jOe52LNlEnOejUVIc783dpZUjH9yyWXUed0ER/+u?=
 =?us-ascii?Q?lFWfpSKpQPwgaBQyD6DJvPj7mRIBXuVB94/6o4rQHKIWzaFVpEydclbSjcOh?=
 =?us-ascii?Q?YzyCJu1FAmpupXxJYeRYTd8lIJGuWCcgry1ss/mL7/54O9vnpR13vTHui/Xt?=
 =?us-ascii?Q?j/bp8ODh++eHXxy1gsmLyyXZSncRrG7kXx+pEy95R4TWWnQNd4XVuKtrxtxf?=
 =?us-ascii?Q?pNmgYytBi+1uQ5h7fivqpRguAk9Sssk+0gv6Gyvly/36EHo/F0Fe+MgThKZQ?=
 =?us-ascii?Q?HggxU6YRG+Dq/b+vfxpf/FbYJHSR1dYpJ9RgjU27RHo/e+VO2JRgdc08CD/I?=
 =?us-ascii?Q?lHqCKhc8uFncs6G8vBy2ZeSuUlTq/HWF15SRsy8Vn1OyCFlXRexYuupczsUO?=
 =?us-ascii?Q?epCKK1iRZKnpQOnsU0YdaRtQwnZEH7Q1BrLBsD9MsWVIYpNBixIQqxMjCKt2?=
 =?us-ascii?Q?SrWyC6m+sHK0a1KjENrA9s8d9Z4lMifb5d89mAo4v5SpOaNzQSsj/cg0Qdbu?=
 =?us-ascii?Q?PJ6jNOqx3RKHE3HEnyRx9RUM2wFr7k7dV7LitrFXevmm3Fk32tnAYAIfkW9n?=
 =?us-ascii?Q?EctSl1XramOF9KzoWu6VhLPtugdkJGkXsXr1ZdXe/TDvaz1xinBwa3SqOzzj?=
 =?us-ascii?Q?rzeC0df4JuhMuKZhdVCEUpjXkjTYfkcjwE1ttORwsVey4lqq7lfD8S6T/ZyH?=
 =?us-ascii?Q?aJZY+KLyULt2vGIG4e+pmt3zshNYQBpiOy5ypHZ9xAPgKR3T5GyswGnJtyEt?=
 =?us-ascii?Q?cppsmoNxQXK99u1DaR8nLaog6bDr5uenOJu99OwtGgfeyMMUkczN4BjbrtQM?=
 =?us-ascii?Q?vE1JHRhYyPuhMCtxP6KrTQNvuGdSjy2HHuGdUBFFMwATE8eVVqLoH7HRmDMu?=
 =?us-ascii?Q?9A=3D=3D?=
X-OriginatorOrg: starfivetech.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 769b00fe-aecc-4c22-8946-08dc306ad88a
X-MS-Exchange-CrossTenant-AuthSource: SHXPR01MB0863.CHNPR01.prod.partner.outlook.cn
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2024 10:17:43.8234
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: eocS6y9iW/cmXfIQGZBZHjNMxUw7o7Mn5UqeKw+uAtfFpoMVzTjatoF0p84VR+vQr9lo5YIJAkZK9vgxCsRYXPuGwEKU5AJJXIj2Kj/enFQ=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SHXPR01MB0765

If other vendor do not select PCI_HOST_COMMON, the driver data is not
struct pci_host_bridge.

Move calling platform_get_drvdata() to mc_platform_init().

Signed-off-by: Minda Chen <minda.chen@starfivetech.com>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
---
 drivers/pci/controller/plda/pcie-microchip-host.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/pci/controller/plda/pcie-microchip-host.c b/drivers/pci/controller/plda/pcie-microchip-host.c
index 9b367927cd32..805870aed61d 100644
--- a/drivers/pci/controller/plda/pcie-microchip-host.c
+++ b/drivers/pci/controller/plda/pcie-microchip-host.c
@@ -876,11 +876,10 @@ static void plda_pcie_setup_window(void __iomem *bridge_base_addr, u32 index,
 	writel(0, bridge_base_addr + ATR0_PCIE_WIN0_SRC_ADDR);
 }
 
-static int plda_pcie_setup_iomems(struct platform_device *pdev,
+static int plda_pcie_setup_iomems(struct pci_host_bridge *bridge,
 				  struct plda_pcie_rp *port)
 {
 	void __iomem *bridge_base_addr = port->bridge_addr;
-	struct pci_host_bridge *bridge = platform_get_drvdata(pdev);
 	struct resource_entry *entry;
 	u64 pci_addr;
 	u32 index = 1;
@@ -1018,6 +1017,7 @@ static int mc_platform_init(struct pci_config_window *cfg)
 {
 	struct device *dev = cfg->parent;
 	struct platform_device *pdev = to_platform_device(dev);
+	struct pci_host_bridge *bridge = platform_get_drvdata(pdev);
 	void __iomem *bridge_base_addr =
 		port->axi_base_addr + MC_PCIE_BRIDGE_ADDR;
 	int ret;
@@ -1031,7 +1031,7 @@ static int mc_platform_init(struct pci_config_window *cfg)
 	mc_pcie_enable_msi(port, cfg->win);
 
 	/* Configure non-config space outbound ranges */
-	ret = plda_pcie_setup_iomems(pdev, &port->plda);
+	ret = plda_pcie_setup_iomems(bridge, &port->plda);
 	if (ret)
 		return ret;
 
-- 
2.17.1