From nobody Thu Apr 9 15:00:54 2026 Received: from DU2PR03CU002.outbound.protection.outlook.com (mail-northeuropeazon11011018.outbound.protection.outlook.com [52.101.65.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAD8C37FF6E; Sun, 8 Mar 2026 11:43:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.65.18 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772970196; cv=fail; b=MaccHMz6eFbxnnsCIKYPK98BYFVYdGP3wET8QUAoQLYyUfkTcZmGC1qLSE9TsYi6n4nMU+QgQUWrgrt89Vf/VsGqH87pFqMXXL/CmdQp+3yqxSan7U6HVKdxxmcug0F5aP5Cmh6359+qNfsju1MkW43HtuYmkFpHYMcccr2to7A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772970196; c=relaxed/simple; bh=S/qr30Q4WIft5CegEAY36oYhqmwUeBEtiwNzuMDgkwY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=Y9MYjP8SLzx5yHB+K+mpJEUsUASXrAg56OQYzjIgWnA4d4HsNF4kNyWt0UmRqQ8VauYO7Ze7AyWLmeWGhPgrtfyd+4jqpLj2V4iAgD5nkPVlPZbJrry7ahJ8BuDV3olc9f2sS6DJUgLBEUwgmKX4jpzIA8QpY5fYWgLZySXqGJU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com; spf=pass smtp.mailfrom=nxp.com; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b=ZJzjd0po; arc=fail smtp.client-ip=52.101.65.18 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=nxp.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nxp.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=nxp.com header.i=@nxp.com header.b="ZJzjd0po" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yGzIhjuW1NsKGhEaLs79c19Ho4TjyHr1ShLEDPohJOMLPdvh3pgGn2XsdZ13UY2Q8XTt4eqLaNqx3J1PmGBKsDADRxYqeDhuLQXevS9dgZT1cSeggcx2qAQE7DMHrPlpMdvhuygbVvIam9riqDVn6EPPHRiHjfVgeCDfY2dfYySDdbYZEDkJMHrunyuD5huSieHYIUFO+29PEB99g9E/iB4fqh8pX/S8YP/twxM+g9DWbQCqrGbTBBsHrzXPGbbYZirn+Pj8r0oi/9ogbgWRrQaFzX0H2nr5xse3EZVLsU7mIHXnkJct76xAH06NdFize4xaOlY4k1PRwTRo/wDg8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OIuv7xfAiGi/g8HMIs+Sm5UJ2WMH+94b+U2ZPe3K2pk=; b=GEDFQpVP4Js1wShohGbiQUiy49rPHJwH3TUVkdN4T3vRHeWYGQQHoz3m84bohWlo38RkosM67ooS49b8ZJo+8y6WRDHV/aPd+0li0Cl3cG32pwnVNwQpTRGVNFtwQcnDkuuyefyG41NCTYFEK3bENG7j05NbeTbnVBW8FumXLllZE06fp6JCK3HFXUTJPVT1jQg21LDzfJx/jqz0DWu4qiOyd5Ab7w7tZRVEh5GVwuwn3u+VhmB/UzX/UPo1M5ZXp62jJAbk3+H58SJp7+zzvBq+PHg7FXEqVssH68oq1ot8l6DSReifwj2o6S1qXZOfjREZmF3YwiDUtiqr8gGesQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OIuv7xfAiGi/g8HMIs+Sm5UJ2WMH+94b+U2ZPe3K2pk=; b=ZJzjd0pog2puD2DIfkf/JcTIXjmfmFYF23lWE7yKFVHdCeHVfG2lwSB1TjWDhm0hahBBuwmlb98bNFNTDTRyPzwb7v0BcbtnFLjxrIwnVfE6DAiga4mUhJo3YCk9i5mU+tPaXMnBCcCM3F0tdX6OSmDe2ihlSDXNN2+re9a3iSSjeZ5LSEzZVbFvKnsuphXCl8unTaZN/4kiRg035LWrSDUCqshCQnHKunZIW5K84DLkd4Q5AfSUsdhSNqyGcHe64w5bYR9RJYHmn2ZQa7HoAW7JuaQ4Pa6tZlton3LuI5v7XWGPQ3Pilp4QTXmeLGdGu3Sn7IUDBX2BgEgVRwti3w== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nxp.com; Received: from AM9PR04MB8585.eurprd04.prod.outlook.com (2603:10a6:20b:438::13) by DB9PR04MB12426.eurprd04.prod.outlook.com (2603:10a6:10:614::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9678.23; Sun, 8 Mar 2026 11:43:11 +0000 Received: from AM9PR04MB8585.eurprd04.prod.outlook.com ([fe80::f010:fca8:7ef:62f4]) by AM9PR04MB8585.eurprd04.prod.outlook.com ([fe80::f010:fca8:7ef:62f4%4]) with mapi id 15.20.9678.023; Sun, 8 Mar 2026 11:43:12 +0000 From: vladimir.oltean@nxp.com To: linux-phy@lists.infradead.org Cc: Vinod Koul , Neil Armstrong , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-can@vger.kernel.org, linux-gpio@vger.kernel.org, linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org, linux-media@vger.kernel.org, linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-riscv@lists.infradead.org, linux-rockchip@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-sunxi@lists.linux.dev, linux-tegra@vger.kernel.org, linux-usb@vger.kernel.org, netdev@vger.kernel.org, spacemit@lists.linux.dev, UNGLinuxDriver@microchip.com, Bjorn Helgaas , Lorenzo Pieralisi , =?UTF-8?q?Krzysztof=20Wilczy=C5=84ski?= , Manivannan Sadhasivam , Rob Herring , Vignesh Raghavendra , Siddharth Vadapalli Subject: [PATCH v2 phy-next 08/24] PCI: Remove device links to PHY Date: Sun, 8 Mar 2026 13:39:53 +0200 Message-ID: <20260308114009.2546587-9-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260308114009.2546587-1-vladimir.oltean@nxp.com> References: <20260308114009.2546587-1-vladimir.oltean@nxp.com> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: WA2P291CA0031.POLP291.PROD.OUTLOOK.COM (2603:10a6:1d0:1f::12) To AM9PR04MB8585.eurprd04.prod.outlook.com (2603:10a6:20b:438::13) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8585:EE_|DB9PR04MB12426:EE_ X-MS-Office365-Filtering-Correlation-Id: ab4e078f-bae5-45ff-6a1e-08de7d07e0b4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|7416014|19092799006|10070799003|1800799024; X-Microsoft-Antispam-Message-Info: tA7AggBo6pr42ZXpJ8096XcW0Y3zmKEd0l4mmbGp+sA98lCvd0WBNKB52OGBT7eOYptOg9E3XwTbfjprd9G3Kcwt5O10wqUyOIniTOk5sVsrS57HmQpvrRN/dJ9M8fdJjSLaJPZVcqTkxIJ8Qh15jOh0guX0/jvjWNPI62G+xVrwQk2xq1wa1WnSI2vrwMztBsBzxyu9iY/QXRD1Fb6t4ulz/OAV6IrTC9yIcWdkQnf4yGw7MLfLrxmuD62QbnU5RajSYZFhEM1TIiEQlA8V4WK8FbmWA3eAXG6XsK5gE8Nh6bWoK9Uuc31DbG8pyeHCLmVi+jDGdslBP2KkFsk8kKgYSYb6pm7UIHUPpgb99Tld7Q+EmfJUlCClD23p6Ui0MB8UU+E4tmZ99XqAbCp11j6OeYPXho8LJasE08xMCsvgun8fhstX7ckSrx3SxcAfxfXKOAmdFK+pYc+TIzAjaAQCSVcvOCnI+7uPXQMeSqjLDE0XRKrRETVUomEBL91Muvhk822FF5OV7y5LqGE7QzLcxrb/721Sy4v5kR122BOKfWJC+YubI8ZNkUAaTyWYih9ZH8LLPu3KmPJma2GI/PRw6Ec+y/tC47dk/+FxPSMD2AjtzMenDSlkdfGAJfWXidvVSRcdcD8a46hjG2jQbRkjpaF4fAOm7su+gYYxZYo/K20rFDgLwVDc5ShftqG4WwKxT91tSwShIJSW8Sxl7XnO5b2HxUxucRVU2Sq5rRI= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR04MB8585.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(7416014)(19092799006)(10070799003)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VGgvbjRuR3BrckdYYXdoZGRVdmh6ZjRsSjJhU3pmY25GWjRSU3NJQkFnMWQ1?= =?utf-8?B?UEhIS0NjbS9KNVF5UzBpVGltNnR6WmtoTzFJNGNTRXVTMmRkOTZRMlFuMFRj?= =?utf-8?B?SytVMU1URm9PdC9kRzBtNGxKbGl5UzhkN0xHSStQUjlNcUJETEM1YUtmV0E5?= =?utf-8?B?cmtNdk5qbmpxOUk5R0FkODVrNm5nekdWa0FWenh4ZUR5VmNWSmR0SWozYVZW?= =?utf-8?B?cU1taDJDQzBJazlwR2FrQURWWEl4VGdQUUpMWXFHR21OWXZ3QVFsNWpISkZi?= =?utf-8?B?Y1VVbVdwcW02ZElUNGNaOUZDRnZmWWNqbDQwRHZYOHgyYnZFaDZ0d2d3Q1Yw?= =?utf-8?B?Z2IyRVpvRWFGOEFtVXZreDI5ZDZmWnp5Qk9kcmxUZlczM1BHd09zTmx3L093?= =?utf-8?B?TUhKMkFscUxzRzdZaWF1b1Btc09wYWhlYmt1dXY0WmFxelFOMG51R2VOdWh4?= =?utf-8?B?M1BSTU9OajhaV21RMXRiaDJyU2VYZG13R2gvL3lLYXVZM09PSEFTWTlSb2lN?= =?utf-8?B?aTVmVTErTmtRSkcrdUdpeGthOWNIVVVsaW9yZm4rK2dTNm55aGdhK2paNG8y?= =?utf-8?B?K05GTVF2Y3NKQ2dRWlk1c05KWUJEK2F2dCtvWnBCeXZnSlhpNS8wY3F5Ty9h?= =?utf-8?B?cGxieFkvSTV2b1lNVHZOK0w1M2hwR1p2WnVXQUlRUG9JR0JhSmxoSlcrT1VN?= =?utf-8?B?V1NZWFIvVTVJSUxhK2N0akFlejgwOVgxVVp0Q2hUY2JzclM5ckRVWDJ6eDNS?= =?utf-8?B?RFdrRFpneUt2MSsyU0l6RmljU0laOFBpR3UxTnp3RTdCK2lna3h3S283QWNZ?= =?utf-8?B?aVIwQ3UxTlB4aTU0b2JzSjErQjVraEdYMlphK011UlRybmp4WDJoLzY2ckw2?= =?utf-8?B?NWxpM014WWZndGZrRlBLTlJoaGR2bWFaUmxjQ2hubS9KaHJ3SDlWUXBuNXpp?= =?utf-8?B?QnVMVmFSVS9oWENVa2VmeTMyVEZEcEZPOStyTmNib3dFZUdsVGtXR1ZoaWpm?= =?utf-8?B?S2hxY1cxVUIyNVpLYU5TM0RMRnJKUG9kR0wwb2xIM2N0aHJadVBQWTF1NS9D?= =?utf-8?B?VVJObG41VmJtVFRCelZsZE5IUldGdGo5ZFFQZ2FTRDdsTlZCLytKcCtKaUdE?= =?utf-8?B?dDA5bE91MDR0WlM2NHgxTWgxNFpUZTloZCsyS3M2SzMvMjlmQXVFYmI0S2VQ?= =?utf-8?B?OVBrU0hmN0g3bjRhV25lYUs1NzRweTJPREVRTXhoTHRoOXQxdlBwSllhd0Yv?= =?utf-8?B?ZjRRb2FqbjBhNnJCQ0FLOStvOUVOOXFRSDdka0REN1I5azh0WWlhbE9EOUpv?= =?utf-8?B?Q3BpaVE5N21kdURFWFRkQ0Q2dS9JRW9IRWhRT1ZvR2JvOGwrMXhob3hETzhV?= =?utf-8?B?UGlwTGRESWJwaDU2SlF1dzgxUUN5ZnR5T2Y3WWdLVnoxeHdGT1dCTEJhY2pH?= =?utf-8?B?R0ZWVldxNVozdi9OT0ttRlZ5WjR1RFd4d09tK0NSaWFBUDNvNXpUODFNV2pN?= =?utf-8?B?eDlYUVkyVnhVMCt6SGowMk1wS255NngzdjZaQ3RHT1doVC9nQ0ZJVG9LczVo?= =?utf-8?B?RFhIOEprN0ZKak80Yi95clpPaFdhTXR3Z3cyM3J1bFZDWkFDTkxIeCswTkJ2?= =?utf-8?B?TnNnQXEwMm1hdXVqc2RHY3JXYTdHbzNBSU5Ha2ppUG1Ga3N0cjVwK21QNS9P?= =?utf-8?B?dk5UdVo2UVIvbnBqcjRDTXd1RXhCNVBkYktqWnMvUi80QnZ6MnVpTXdyUXFL?= =?utf-8?B?K0FyS2dvWUhVc1ExWGliL0xJcjlYOEgwMUVEQzMrMUNtdFdYdk1uZUJQaHVI?= =?utf-8?B?VjRZVlF5ajdGdHdVempFQXpKY1JxSWdtUWpkU1BMRHpSR1g4K2ZKdUxWOW9L?= =?utf-8?B?emIwbVNFWGdJbE1QbjRqRTdTWjJIbkZlbitBanM4dzZDZUplRkFYN1ZkK0VD?= =?utf-8?B?WlFLdnVFOXl5akF3U1BLa1k3Y2wxSXVLTnRGb09jY3VXQ1BKcVc2dDh2c1hZ?= =?utf-8?B?UFQ4Q1BUVFl1OEc2d3JVMHlYcWRZTjU4TjNDdngxdC92U0phN3h4UTZyM0dE?= =?utf-8?B?dDh6SkdMU3ZoU1I4UGJ4NFpwWS82UDF5Q0xLVmVlWm9KU0Y2T3VoWXM4WGxO?= =?utf-8?B?OCsrVjh4UFFvSEJxcFVWZ2hSL0dac3FFZERrWkNFeUovWjRQRjVuRWFjOVd3?= =?utf-8?B?U21JS0NzMnVMcGQwcDE3Z3pnQlFOZXZHSXJUSmxES0grbWs2VzV3NDg4Smor?= =?utf-8?B?bWlpRjZCREkxODJrWU0xTHhyL2kxRnpBV0VYbzllNzF2cEJrWkVrbDhOYk5I?= =?utf-8?B?elB0dmFoaEwwdkxRNmV3TFoxbFdCMUlPUHhJMWwzQURjQzdkZUhnNk5HUGhk?= =?utf-8?Q?MmoSbVMOGHxyzjEYBupsEDHc6d+Q99t/STDaKr1IRabd/?= X-MS-Exchange-AntiSpam-MessageData-1: QyqwqrKmKDE8BG/nYx7PX7l/HHLdHVB5hVc= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab4e078f-bae5-45ff-6a1e-08de7d07e0b4 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8585.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Mar 2026 11:43:12.3094 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: FfB0WVqP9QZyFuDusDDwHp7T+9SQjeGbhdnJpOk/qCx06QlFFQ652wNiY8ZyfNyGhE9xz5PYgY4Mslq757pKRg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB9PR04MB12426 This is practically a full revert of commit 7a4db656a635 ("PCI: dra7xx: Create functional dependency between PCIe and P= HY") and a partial revert of the device link pieces from commits dfb80534692d ("PCI: cadence: Add generic PHY support to host and EP drivers= ") 49229238ab47 ("PCI: keystone: Cleanup PHY handling") The trouble with these commits is that they dereference fields inside struct phy from a consumer driver, which will become no longer possible. Since commit 987351e1ea77 ("phy: core: Add consumer device link support") from 2019, the PHY core also adds a device link to order PHY provider and consumer suspend/resume operations. All reverted commits are from 2017-2018, and what they do should actually be redundant now. Signed-off-by: Vladimir Oltean Acked-by: Bjorn Helgaas --- Cc: Lorenzo Pieralisi Cc: "Krzysztof Wilczy=C5=84ski" Cc: Manivannan Sadhasivam Cc: Rob Herring Cc: Bjorn Helgaas Cc: Vignesh Raghavendra Cc: Siddharth Vadapalli v1->v2: - fully remove struct device link **link from struct cdns_pcie and from cdns_plat_pcie_probe() error path - collect tag - adjust commit title --- .../controller/cadence/pcie-cadence-plat.c | 2 -- drivers/pci/controller/cadence/pcie-cadence.c | 16 +--------- drivers/pci/controller/cadence/pcie-cadence.h | 2 -- drivers/pci/controller/dwc/pci-dra7xx.c | 16 ---------- drivers/pci/controller/dwc/pci-keystone.c | 31 +++---------------- 5 files changed, 5 insertions(+), 62 deletions(-) diff --git a/drivers/pci/controller/cadence/pcie-cadence-plat.c b/drivers/p= ci/controller/cadence/pcie-cadence-plat.c index b067a3296dd3..54531f86bf45 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-plat.c +++ b/drivers/pci/controller/cadence/pcie-cadence-plat.c @@ -123,8 +123,6 @@ static int cdns_plat_pcie_probe(struct platform_device = *pdev) pm_runtime_disable(dev); cdns_pcie_disable_phy(cdns_plat_pcie->pcie); phy_count =3D cdns_plat_pcie->pcie->phy_count; - while (phy_count--) - device_link_del(cdns_plat_pcie->pcie->link[phy_count]); =20 return 0; } diff --git a/drivers/pci/controller/cadence/pcie-cadence.c b/drivers/pci/co= ntroller/cadence/pcie-cadence.c index a1eada56edba..0ac980249941 100644 --- a/drivers/pci/controller/cadence/pcie-cadence.c +++ b/drivers/pci/controller/cadence/pcie-cadence.c @@ -222,7 +222,6 @@ int cdns_pcie_init_phy(struct device *dev, struct cdns_= pcie *pcie) struct device_node *np =3D dev->of_node; int phy_count; struct phy **phy; - struct device_link **link; int i; int ret; const char *name; @@ -238,10 +237,6 @@ int cdns_pcie_init_phy(struct device *dev, struct cdns= _pcie *pcie) if (!phy) return -ENOMEM; =20 - link =3D devm_kcalloc(dev, phy_count, sizeof(*link), GFP_KERNEL); - if (!link) - return -ENOMEM; - for (i =3D 0; i < phy_count; i++) { of_property_read_string_index(np, "phy-names", i, &name); phy[i] =3D devm_phy_get(dev, name); @@ -249,17 +244,10 @@ int cdns_pcie_init_phy(struct device *dev, struct cdn= s_pcie *pcie) ret =3D PTR_ERR(phy[i]); goto err_phy; } - link[i] =3D device_link_add(dev, &phy[i]->dev, DL_FLAG_STATELESS); - if (!link[i]) { - devm_phy_put(dev, phy[i]); - ret =3D -EINVAL; - goto err_phy; - } } =20 pcie->phy_count =3D phy_count; pcie->phy =3D phy; - pcie->link =3D link; =20 ret =3D cdns_pcie_enable_phy(pcie); if (ret) @@ -268,10 +256,8 @@ int cdns_pcie_init_phy(struct device *dev, struct cdns= _pcie *pcie) return 0; =20 err_phy: - while (--i >=3D 0) { - device_link_del(link[i]); + while (--i >=3D 0) devm_phy_put(dev, phy[i]); - } =20 return ret; } diff --git a/drivers/pci/controller/cadence/pcie-cadence.h b/drivers/pci/co= ntroller/cadence/pcie-cadence.h index 443033c607d7..35b0b33bc6fb 100644 --- a/drivers/pci/controller/cadence/pcie-cadence.h +++ b/drivers/pci/controller/cadence/pcie-cadence.h @@ -82,7 +82,6 @@ struct cdns_plat_pcie_of_data { * @is_rc: tell whether the PCIe controller mode is Root Complex or Endpoi= nt. * @phy_count: number of supported PHY devices * @phy: list of pointers to specific PHY control blocks - * @link: list of pointers to corresponding device link representations * @ops: Platform-specific ops to control various inputs from Cadence PCIe * wrapper * @cdns_pcie_reg_offsets: Register bank offsets for different SoC @@ -95,7 +94,6 @@ struct cdns_pcie { bool is_rc; int phy_count; struct phy **phy; - struct device_link **link; const struct cdns_pcie_ops *ops; const struct cdns_plat_pcie_of_data *cdns_pcie_reg_offsets; }; diff --git a/drivers/pci/controller/dwc/pci-dra7xx.c b/drivers/pci/controll= er/dwc/pci-dra7xx.c index d5d26229063f..b91ab37845c9 100644 --- a/drivers/pci/controller/dwc/pci-dra7xx.c +++ b/drivers/pci/controller/dwc/pci-dra7xx.c @@ -9,7 +9,6 @@ =20 #include #include -#include #include #include #include @@ -683,7 +682,6 @@ static int dra7xx_pcie_probe(struct platform_device *pd= ev) int i; int phy_count; struct phy **phy; - struct device_link **link; void __iomem *base; struct dw_pcie *pci; struct dra7xx_pcie *dra7xx; @@ -731,10 +729,6 @@ static int dra7xx_pcie_probe(struct platform_device *p= dev) if (!phy) return -ENOMEM; =20 - link =3D devm_kcalloc(dev, phy_count, sizeof(*link), GFP_KERNEL); - if (!link) - return -ENOMEM; - dra7xx->clk =3D devm_clk_get_optional(dev, NULL); if (IS_ERR(dra7xx->clk)) return dev_err_probe(dev, PTR_ERR(dra7xx->clk), @@ -749,12 +743,6 @@ static int dra7xx_pcie_probe(struct platform_device *p= dev) phy[i] =3D devm_phy_get(dev, name); if (IS_ERR(phy[i])) return PTR_ERR(phy[i]); - - link[i] =3D device_link_add(dev, &phy[i]->dev, DL_FLAG_STATELESS); - if (!link[i]) { - ret =3D -EINVAL; - goto err_link; - } } =20 dra7xx->base =3D base; @@ -856,10 +844,6 @@ static int dra7xx_pcie_probe(struct platform_device *p= dev) pm_runtime_disable(dev); dra7xx_pcie_disable_phy(dra7xx); =20 -err_link: - while (--i >=3D 0) - device_link_del(link[i]); - return ret; } =20 diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/contro= ller/dwc/pci-keystone.c index 642e4c45eefc..07698c645e02 100644 --- a/drivers/pci/controller/dwc/pci-keystone.c +++ b/drivers/pci/controller/dwc/pci-keystone.c @@ -130,7 +130,6 @@ struct keystone_pcie { int num_lanes; u32 num_viewport; struct phy **phy; - struct device_link **link; struct device_node *msi_intc_np; struct irq_domain *intx_irq_domain; struct device_node *np; @@ -1118,7 +1117,6 @@ static int ks_pcie_probe(struct platform_device *pdev) enum dw_pcie_device_mode mode; struct dw_pcie *pci; struct keystone_pcie *ks_pcie; - struct device_link **link; struct gpio_desc *gpiod; struct resource *res; void __iomem *base; @@ -1189,31 +1187,17 @@ static int ks_pcie_probe(struct platform_device *pd= ev) if (!phy) return -ENOMEM; =20 - link =3D devm_kcalloc(dev, num_lanes, sizeof(*link), GFP_KERNEL); - if (!link) - return -ENOMEM; - for (i =3D 0; i < num_lanes; i++) { snprintf(name, sizeof(name), "pcie-phy%d", i); phy[i] =3D devm_phy_optional_get(dev, name); if (IS_ERR(phy[i])) { ret =3D PTR_ERR(phy[i]); - goto err_link; - } - - if (!phy[i]) - continue; - - link[i] =3D device_link_add(dev, &phy[i]->dev, DL_FLAG_STATELESS); - if (!link[i]) { - ret =3D -EINVAL; - goto err_link; + goto err; } } =20 ks_pcie->np =3D np; ks_pcie->pci =3D pci; - ks_pcie->link =3D link; ks_pcie->num_lanes =3D num_lanes; ks_pcie->phy =3D phy; =20 @@ -1223,7 +1207,7 @@ static int ks_pcie_probe(struct platform_device *pdev) ret =3D PTR_ERR(gpiod); if (ret !=3D -EPROBE_DEFER) dev_err(dev, "Failed to get reset GPIO\n"); - goto err_link; + goto err; } =20 /* Obtain references to the PHYs */ @@ -1238,7 +1222,7 @@ static int ks_pcie_probe(struct platform_device *pdev) =20 if (ret) { dev_err(dev, "failed to enable phy\n"); - goto err_link; + goto err; } =20 platform_set_drvdata(pdev, ks_pcie); @@ -1325,25 +1309,18 @@ static int ks_pcie_probe(struct platform_device *pd= ev) pm_runtime_disable(dev); ks_pcie_disable_phy(ks_pcie); =20 -err_link: - while (--i >=3D 0 && link[i]) - device_link_del(link[i]); - +err: return ret; } =20 static void ks_pcie_remove(struct platform_device *pdev) { struct keystone_pcie *ks_pcie =3D platform_get_drvdata(pdev); - struct device_link **link =3D ks_pcie->link; - int num_lanes =3D ks_pcie->num_lanes; struct device *dev =3D &pdev->dev; =20 pm_runtime_put(dev); pm_runtime_disable(dev); ks_pcie_disable_phy(ks_pcie); - while (num_lanes--) - device_link_del(link[num_lanes]); } =20 static struct platform_driver ks_pcie_driver =3D { --=20 2.43.0