From patchwork Mon Mar 9 19:08:26 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vladimir Oltean X-Patchwork-Id: 222 Received: from MRWPR03CU001.outbound.protection.outlook.com (mail-francesouthazon11011023.outbound.protection.outlook.com [40.107.130.23]) (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 B1F2C3EFD15; Mon, 9 Mar 2026 19:09:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.130.23 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773083385; cv=fail; b=LK1ccdHudCL67PptmSD6dg+zEC//IvJLXrrH3Wyg9uMeXyZIY323IZVSLJdMA2GEZDJFmjd/L4M/mYM+Zs6WFev264YrYkCZjaZsWmUPguqLZoGgP5Rnj5wRxUM7leBhPMjBAI3d/3pJpYxkg0/hLZA+PhUSPm/0tBkaXdJEFJc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773083385; c=relaxed/simple; bh=DNVdHvtaODP1EQje0BMvE+lT1pjdrOBndHPz/7rCees=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: Content-Type:MIME-Version; b=P7L5Su3ezzHkGTFWdNGaHb2fJXDW9jjWLs37+o+svkihm/tN2K9Bg8JRNYfRssOHUtAWAyQk5OBXuDjAqGQX4uXuNJnzwXyhTcgvXZHqs4aHB5vRuOCMYKV9KoQPq6VuvuPg823qrVSvaKbqHRsE1CXq9gYKgmqptfioTmw+aME= 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=FD6km2ZJ; arc=fail smtp.client-ip=40.107.130.23 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="FD6km2ZJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T0x8fzaQ9LBEfJRO/ZP1+fPxCWGZLPOn4ffhyycS8wSFAd0CENRh9I4r7KzNZ6JTQSW3gDeQOcsjuT0ey4GtFvmhI7irkuxjZuBl6BKEElcEOlvtgT/2WhWMjWy+Z3S3JrZwBpcaTevvgcS50MdDiuPBbQD3vvefQ6JKzx/9NWLkbkjO5xZ4wfP31GXUehIJACpAqICgANsHMRxIqMyWI6AXdy6m0AMjp93a5R8uoIbdFDt6fSYmY5MhaJUcZ7bkTl1pqnnTtH2ROtT77N+9U+ph50TJdN/DqMp8yAnRL23lv+5OUMsucTtagXnt1SRv8f9sjeYW1/HtGZS/Y9Rm2g== 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=FyIQZr+rDW6jLC91REqJJkAGNC5vWrLn3ug122BI95M=; b=F30Hmg2rM5eJCtE6FOSHiBEa37HCIQnfaXmAvDPC22Fi0KhZyzya1VQlrStfkqcRR+YOjABGgq+eJXseJG5eowohmjhweT585QzcpCfZOc74M0/bLN37bOFGvr7nBmCOg7S6vIy9F6KnR0Q4ALyK0I+mYKFBdYDCx8EyUzdr+n5nTIo3JAMDoLX6xlZsziR2Z+0kKwOZP5t35eVXgZQNc/F0PwsofQNypU4lUN+DZNPwYUELkSOnE74C4O1KJoUgn1Zpr1NkdVzBuxGK8kGjJKapcJn+ig4FNQa+yaPWl62b/BV5IrUuy1L14zrPOHBIoRy9IkqKEwDRJvtQpZ52ww== 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=FyIQZr+rDW6jLC91REqJJkAGNC5vWrLn3ug122BI95M=; b=FD6km2ZJIX8hR9f4lANPRinp/YVJrj6y5/+pAoCFJ5OU9goMQ9e3HXu60mOKsKblgJmItYbZdUPyXy5hybky0qZfUeJoInoSKrbNeYrSDUfiSyleVHaLnH5bZBIyrWzoqq0NKoj2nCO0+Zbicb8uAB1F4Bwq+dlUoJ6NcJKc4MJpFKJOKW4lO0WVrqMc56a3IMl/LQAU7AciKdFCIw8qmFhdoYGgwytsbhEiVecfdeQRm0s19XpT8XL17sQmFQtrJltfHCsSV4eFETDCk9mJT4cMlX8UsvZYCj322zmtg9rRA/VFjn7fEVjzaWKldICX9aBJVBlykBvhewB/1eOiuw== 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 AM9PR04MB7540.eurprd04.prod.outlook.com (2603:10a6:20b:283::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9678.25; Mon, 9 Mar 2026 19:09:25 +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; Mon, 9 Mar 2026 19:09:25 +0000 From: Vladimir Oltean 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-scsi@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_Wilczy=C5=84?= =?utf-8?q?ski?= , Manivannan Sadhasivam , Rob Herring , Vignesh Raghavendra , Siddharth Vadapalli Subject: [PATCH v3 phy-next 08/24] PCI: Remove device links to PHY Date: Mon, 9 Mar 2026 21:08:26 +0200 Message-ID: <20260309190842.927634-9-vladimir.oltean@nxp.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260309190842.927634-1-vladimir.oltean@nxp.com> References: <20260309190842.927634-1-vladimir.oltean@nxp.com> X-ClientProxiedBy: VI1PR06CA0098.eurprd06.prod.outlook.com (2603:10a6:803:8c::27) To AM9PR04MB8585.eurprd04.prod.outlook.com (2603:10a6:20b:438::13) Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AM9PR04MB8585:EE_|AM9PR04MB7540:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b3cc4e0-41c4-4e49-184d-08de7e0f6100 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|19092799006|1800799024|366016|10070799003|7416014|376014; X-Microsoft-Antispam-Message-Info: RQM+Euh/xKDA8qddHm5NL+fM0OVzpt/xI6KjE9U/iaMm4KJCvqePSZri4EJkwwnUQRT1y6QtSaNVut+r6XKiHxDKVju40b6OSRmY32tXtCbYPhnYfZVUbZA9hmox4i2J2MP12RDMn4XEQvQqnhzzKybXlc2nDOCpR7VZ5k5AowjkswotwNjjajllZcMHInfBvPqMTgRBfQ2fY0t9UWdhp5CkRHxvN7W8NE48jCx4gMyfamY7qAr0Xg6bUBboLOczaakN9mqfSZ+6lSr4G8GZq/iXTbvdqOllVyWRSpJsxnPpYgZUhytw6tlxmT2s2i8dx224U7E5GkJWyB6lm9byDP0YbUehpgm2L+y95V26WATn7tmH8W0zN+CZ0CHxcxeC8pmHy0oVba7nqF5ZkO97IBNLwDegsL1Nl4qa/DQudzp4Hc+MThkwKL5tmPZq7gLDbr0AgbJKMr79ghw7yzZW/BFCBs/pE/9j1jrae/ITRDZ+jRyie57lFf/uhrTaJDHFRcjdyKtTVZolsaGHhK+mAw2CiJw12jDvmWBRiuflamyymvk73hZfqDRwjQJ15I5aok2fIaXsWNwcjcuTZQmB46ZZDDrz8sNToWVmwWtCAEIcW91DBFYWyhDYW65yM0ndePv8tUzUC9DI05Se2kK2rdon8/cYMb3hje+EKz6grZhlyFN7PachNTHdhPsj3WR/xblo+i+h8VOmqXRlS9H++DH7KZA4KarPRRHgeHxtylA= 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)(19092799006)(1800799024)(366016)(10070799003)(7416014)(376014);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?PT6SbktmHc88nlDOstjqrNDd74d3?= =?utf-8?q?EhDeED87HbJHQxOLyRcQE8DhQqtYzYo67h1+YzFKGGsEf2TE6AyKcIIyqv5foVwud?= =?utf-8?q?s6EYbm18HhqzPm/uncKdEuDPhgCDkCwE+A7UZe2UQORXUjno2llK+YAEgjWD78bFu?= =?utf-8?q?KO2qmfHIW3F3z/70T66RbXPZXa++KcghSWsKicd1BKYJL+ZTY4h8O67wDp48j0j9q?= =?utf-8?q?RcPIAl0CmTViuJZ6InAt3q5YubUqyEHQOebQmd0id7GtmZ9hRS2syzC55x49Bz9gj?= =?utf-8?q?e0Q4NXRM3hNIEYWe2EbXpz9luHSkUTqVRDrk7lSG9k6zpvPkJ+R8HEr8CTPI6jLp2?= =?utf-8?q?aeU3evWqGLEnmSqtMTO5KfncIoRt39IlM80w95PIyVNdNdjXGDZqQ+rsoAheUHxYu?= =?utf-8?q?dkdJi6ajbwOGuNIrTOWe8v1ipuXFbN4c6QBhfK1BC9dH4s5GyuIluPjjVpfwuefoE?= =?utf-8?q?FheLeUC5DHFXo78YTTN98F/JhGefs+BF11nvJiyFJy524vibgVNC2+WRc728G6vkD?= =?utf-8?q?gPcaJzXlrpuCumPLn5ngLVK6veTJSDxM3y6W9ufngT6JSfZXtsowlsHucyo9fnqSf?= =?utf-8?q?bjAhoYPwmGPsogd2TiEp6HCy8BQVK/vrjKx7EixM/H3dqrM5XWaSpANUa4PWxXjEt?= =?utf-8?q?xhj+RdcfFGxDR7V5LzVc7rj2j4jeuQSLPjalQLVbQdHU7AWahKMf5Sck/8ALyH845?= =?utf-8?q?aIeTrH53LMGKY5m+RvW4Rh7sSSfNbNc07ZHOx0p6oL60Mr19dXOP8ZW0TtXKpwzZs?= =?utf-8?q?7TWEtHArDXLNAF8X0CHdTqkZZu65C3Lnl9+/y/CfVz64Y/JU86eOgMIMpdt+U2SWW?= =?utf-8?q?A0ZrtAWTSgN/2CSDWTjJCUwVOentlWmH17+6iuAQrAZkvsWebboNr0+UDgIGc9npG?= =?utf-8?q?KbsJfRtHY3NoY1ZW5QUeicDwDOoVLDaVkKcd6peWnXi7yk/8dqD+dPsrnsl/v95CN?= =?utf-8?q?CHBqCe1ofdTXrcknGVMOYVVqrsu4xm5axyCr1+rOM4wz8QL0tkQ6ccNShngUjQh4w?= =?utf-8?q?E62dS7frWINTKYKd60Ypy6WAeLirrRAhMeMAO6F6HgxIdvsg90D4QKBAXculA4pu3?= =?utf-8?q?4VrJ6+nJbceYTMuYEj2x3N6kTP+Nj6VoQALOOJnXSg25XsAN4Yx87aZ27fp3PGDn3?= =?utf-8?q?SRKAkR9ufqZTDGaw1k87dxBXqfDMw5uvc7EU18Q6agy9CS5KWiSd3yNJkHNNSG1wL?= =?utf-8?q?tkpdWAR9Tx4s/PGJf4f6ZGiAQTG1x1iAh1WS1fNUly/pNVfK3Zx9gtqHD2GKG24Wy?= =?utf-8?q?9Vr6qoVDLPKrvUz8J38dDwelTys3GVxcxDRYzaoxIZyOoFQjNVOC2p45qGgLwMvpL?= =?utf-8?q?dFqmmRt7GrSZApG/e1KyWNtzplWqdKyrcOnLKP0YtjpnpCuhstqa9b8mloHN/HrhL?= =?utf-8?q?+yAUxTnAAT52JYlMUTm2DRzOPCH/hPlgHtbeLxU7omesSvhqgN9mckQ+3qcb90DTg?= =?utf-8?q?boQo18ogDeBogC73p2hFIlV503j8tzuM+TJIudfkRLXLGfvZGGfgyf67NkgUTxewN?= =?utf-8?q?lpTVx476A4Z95qLH7Hvi9kFybNPnF8M3WJdeBCfIZKIrpAGerF8PktHAtcUtcTlsJ?= =?utf-8?q?hP2N51FdD2CL/Ydj/qRrZQeNtpJCYgLoKCGwRPJ8nesH+6ezybqfXDGKSSxrNgzbg?= =?utf-8?q?L8uGCc2hRG5DgnbryLdBVucX0DEXYtX4HeWOFPI7ZEZXqGt6BuPtP1m1FjfLstKxR?= =?utf-8?q?snhiyn9g6Vmva+yf6?= X-MS-Exchange-AntiSpam-MessageData-1: FaPqz+EoCPEwVLqgDM6piE0VzaF2ozw9MPQ= X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b3cc4e0-41c4-4e49-184d-08de7e0f6100 X-MS-Exchange-CrossTenant-AuthSource: AM9PR04MB8585.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Mar 2026 19:09:25.4006 (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: ATS3sS4oD/d1GXA76s+gQjUi6IVyKHzoRN2s6gAbts6F2dvjij3ytsEaH2PP59FaioT8lvdri4F+GlXt6Yl8bA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR04MB7540 Status: O This is practically a full revert of commit 7a4db656a635 ("PCI: dra7xx: Create functional dependency between PCIe and PHY") 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ński" Cc: Manivannan Sadhasivam Cc: Rob Herring Cc: Bjorn Helgaas Cc: Vignesh Raghavendra Cc: Siddharth Vadapalli v2->v3: - remove dangling set but unused phy_count local variable in cdns_plat_pcie_probe() 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 | 4 --- 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(+), 64 deletions(-) diff --git a/drivers/pci/controller/cadence/pcie-cadence-plat.c b/drivers/pci/controller/cadence/pcie-cadence-plat.c index b067a3296dd3..fc39c01b7964 100644 --- a/drivers/pci/controller/cadence/pcie-cadence-plat.c +++ b/drivers/pci/controller/cadence/pcie-cadence-plat.c @@ -41,7 +41,6 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) struct pci_host_bridge *bridge; struct cdns_pcie_ep *ep; struct cdns_pcie_rc *rc; - int phy_count; bool is_rc; int ret; @@ -122,9 +121,6 @@ static int cdns_plat_pcie_probe(struct platform_device *pdev) pm_runtime_put_sync(dev); pm_runtime_disable(dev); cdns_pcie_disable_phy(cdns_plat_pcie->pcie); - phy_count = cdns_plat_pcie->pcie->phy_count; - while (phy_count--) - device_link_del(cdns_plat_pcie->pcie->link[phy_count]); return 0; } diff --git a/drivers/pci/controller/cadence/pcie-cadence.c b/drivers/pci/controller/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 = 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; - link = devm_kcalloc(dev, phy_count, sizeof(*link), GFP_KERNEL); - if (!link) - return -ENOMEM; - for (i = 0; i < phy_count; i++) { of_property_read_string_index(np, "phy-names", i, &name); phy[i] = devm_phy_get(dev, name); @@ -249,17 +244,10 @@ int cdns_pcie_init_phy(struct device *dev, struct cdns_pcie *pcie) ret = PTR_ERR(phy[i]); goto err_phy; } - link[i] = device_link_add(dev, &phy[i]->dev, DL_FLAG_STATELESS); - if (!link[i]) { - devm_phy_put(dev, phy[i]); - ret = -EINVAL; - goto err_phy; - } } pcie->phy_count = phy_count; pcie->phy = phy; - pcie->link = link; ret = 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; err_phy: - while (--i >= 0) { - device_link_del(link[i]); + while (--i >= 0) devm_phy_put(dev, phy[i]); - } return ret; } diff --git a/drivers/pci/controller/cadence/pcie-cadence.h b/drivers/pci/controller/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 Endpoint. * @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/controller/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 @@ #include #include -#include #include #include #include @@ -683,7 +682,6 @@ static int dra7xx_pcie_probe(struct platform_device *pdev) 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 *pdev) if (!phy) return -ENOMEM; - link = devm_kcalloc(dev, phy_count, sizeof(*link), GFP_KERNEL); - if (!link) - return -ENOMEM; - dra7xx->clk = 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 *pdev) phy[i] = devm_phy_get(dev, name); if (IS_ERR(phy[i])) return PTR_ERR(phy[i]); - - link[i] = device_link_add(dev, &phy[i]->dev, DL_FLAG_STATELESS); - if (!link[i]) { - ret = -EINVAL; - goto err_link; - } } dra7xx->base = base; @@ -856,10 +844,6 @@ static int dra7xx_pcie_probe(struct platform_device *pdev) pm_runtime_disable(dev); dra7xx_pcie_disable_phy(dra7xx); -err_link: - while (--i >= 0) - device_link_del(link[i]); - return ret; } diff --git a/drivers/pci/controller/dwc/pci-keystone.c b/drivers/pci/controller/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 *pdev) if (!phy) return -ENOMEM; - link = devm_kcalloc(dev, num_lanes, sizeof(*link), GFP_KERNEL); - if (!link) - return -ENOMEM; - for (i = 0; i < num_lanes; i++) { snprintf(name, sizeof(name), "pcie-phy%d", i); phy[i] = devm_phy_optional_get(dev, name); if (IS_ERR(phy[i])) { ret = PTR_ERR(phy[i]); - goto err_link; - } - - if (!phy[i]) - continue; - - link[i] = device_link_add(dev, &phy[i]->dev, DL_FLAG_STATELESS); - if (!link[i]) { - ret = -EINVAL; - goto err_link; + goto err; } } ks_pcie->np = np; ks_pcie->pci = pci; - ks_pcie->link = link; ks_pcie->num_lanes = num_lanes; ks_pcie->phy = phy; @@ -1223,7 +1207,7 @@ static int ks_pcie_probe(struct platform_device *pdev) ret = PTR_ERR(gpiod); if (ret != -EPROBE_DEFER) dev_err(dev, "Failed to get reset GPIO\n"); - goto err_link; + goto err; } /* Obtain references to the PHYs */ @@ -1238,7 +1222,7 @@ static int ks_pcie_probe(struct platform_device *pdev) if (ret) { dev_err(dev, "failed to enable phy\n"); - goto err_link; + goto err; } platform_set_drvdata(pdev, ks_pcie); @@ -1325,25 +1309,18 @@ static int ks_pcie_probe(struct platform_device *pdev) pm_runtime_disable(dev); ks_pcie_disable_phy(ks_pcie); -err_link: - while (--i >= 0 && link[i]) - device_link_del(link[i]); - +err: return ret; } static void ks_pcie_remove(struct platform_device *pdev) { struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev); - struct device_link **link = ks_pcie->link; - int num_lanes = ks_pcie->num_lanes; struct device *dev = &pdev->dev; pm_runtime_put(dev); pm_runtime_disable(dev); ks_pcie_disable_phy(ks_pcie); - while (num_lanes--) - device_link_del(link[num_lanes]); } static struct platform_driver ks_pcie_driver = {